git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC PATCH] sequencer - tipped merge strategy

From
Elijah Newren <newren@gmail.com>
Date
Mar 4, 2023, 20:36 UTC
Message-ID
<CABPp-BFCNjMsxAcLOxr_9Rnu3n_KL5RMCfD_m7ytS+b_gbd3Xw@mail.gmail.com>
In-Reply-To
<CAOc6etaCz=JWPnk2Jv8KYG02xBN+jZG1EfbnwtKnq_A0UBUpEg@mail.gmail.com>

On Sat, Mar 4, 2023 at 3:57 AM Edmundo Carmona Antoranz <eantoranz@gmail.com> wrote:

Show 9 quoted lines
>
> On Sat, Mar 4, 2023 at 12:45 PM Edmundo Carmona Antoranz
> <eantoranz@gmail.com> wrote:
> >
> > Usercase can be at the moment trying to rebase (with merges) on top of
> > an exact base copy. In cases like this, git just crashes on merge
> > commits. An easy example:
>
> I should have said _crashes on merge commits where there was a conflict_.

Crash tends to mean the program has done something not allowed by the operating system. I don't think that's what's happening here. Do you mean Git stops with conflicts?

Previous: Edmundo Carmona AntoranzNext: Edmundo Carmona Antoranz
Message 5 of 9 in “sequencer - tipped merge strategy”
  1. sequencer - tipped merge strategyEdmundo Carmona Antoranz, Mar 3, 2023
  2. Junio C HamanoMar 3, 2023
  3. Edmundo Carmona AntoranzMar 4, 2023
  4. Edmundo Carmona AntoranzMar 4, 2023
  5. Elijah NewrenMar 4, 2023
  6. Edmundo Carmona AntoranzMar 5, 2023
  7. Elijah NewrenMar 4, 2023
  8. Edmundo Carmona AntoranzMar 5, 2023
  9. Junio C HamanoMar 6, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.