From: Elijah Newren <newren@gmail.com>
To: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [RFC PATCH] sequencer - tipped merge strategy
Date: Sat, 4 Mar 2023 12:36:45 -0800 [thread overview]
Message-ID: <CABPp-BFCNjMsxAcLOxr_9Rnu3n_KL5RMCfD_m7ytS+b_gbd3Xw@mail.gmail.com> (raw)
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:
>
> 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?
next prev parent reply other threads:[~2023-03-04 20:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 14:53 [RFC PATCH] sequencer - tipped merge strategy Edmundo Carmona Antoranz
2023-03-03 16:45 ` Junio C Hamano
2023-03-04 11:45 ` Edmundo Carmona Antoranz
2023-03-04 11:47 ` Edmundo Carmona Antoranz
2023-03-04 20:36 ` Elijah Newren [this message]
2023-03-05 13:40 ` Edmundo Carmona Antoranz
2023-03-04 20:31 ` Elijah Newren
2023-03-05 14:00 ` Edmundo Carmona Antoranz
2023-03-06 17:32 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BFCNjMsxAcLOxr_9Rnu3n_KL5RMCfD_m7ytS+b_gbd3Xw@mail.gmail.com \
--to=newren@gmail.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).