From: Jeff King <peff@peff.net>
To: Bryan Turner <bturner@atlassian.com>
Cc: Andrew Ottaviano <andrew_o1995@live.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Rebase Question
Date: Tue, 11 May 2021 20:44:19 -0400 [thread overview]
Message-ID: <YJsk49WBd27NrCAA@coredump.intra.peff.net> (raw)
In-Reply-To: <CAGyf7-GEA0mtxUxqEjYsfqM4Te-5JO5_nW0S6Vitdmywz1J7mg@mail.gmail.com>
On Tue, May 11, 2021 at 05:29:03PM -0700, Bryan Turner wrote:
> On Tue, May 11, 2021 at 5:07 PM Andrew Ottaviano <andrew_o1995@live.com> wrote:
> >
> > Hello all!
> >
> > I’ve used git for a few years now and I
> > think it is an amazing tool! Thank you for your hard work in
> > developing/maintaining it! I really appreciate it!
> >
> > I have a question. Let’s say that my
> > colleague and I branch off of master and are working. Let’s say I’m 5 commits
> > ahead of master and my colleague merges in ahead of me. The logical thing in my
> > mind is to rebase off of master. The difficulty with this is that if I have
> > merge conflicts that show up on my first commit, I have to resolve that stupid
> > thing for every subsequent commit. I could squash, but then I loose branch
> > history, so I don’t really want to do that. I could rebase in interactive mode,
> > but if I recall, I still need to resolve all the conflicts on every commit
> > before it squashes.
>
> Have you investigated git rerere[1] at all? Documentation indicates it
> works for rebase as well as merge, so it might be possible to train
> that to resolve the conflicts.
I don't think rerere helps here. In a rebase like this, the problem is
that it _isn't_ the same conflict.
Imagine a case like this:
-- >8 --
git init repo
cd repo
# both branches start with just the line "base"
echo base >file
git add file
git commit -m base
# one side adds a new line
git checkout -b newline
echo another >>file
git commit -am 'add a line'
# and the other modifies the first line
git checkout -b other HEAD^
echo one >file
git commit -am one
echo two >file
git commit -am two
# and now we rebase on top of the newline branch
git rebase newline
-- >8 --
Applying the first commit gets this conflict (in diff3 form)
<<<<<<< ours
base
another
||||||| base
base
=======
one
>>>>>>> theirs
After we fix that up to "one\nanother", the second conflict is:
<<<<<<< ours
one
another
||||||| base
one
=======
two
>>>>>>> theirs
Likewise, even if you had done the original merge between branch tips,
you'd have seen yet another conflict:
<<<<<<< ours
two
||||||| base
base
=======
base
another
>>>>>>> theirs
The actual lines changed are the same, but as the nearby context is
continually shifting, we don't consider these to be the "same" conflict.
-Peff
next prev parent reply other threads:[~2021-05-12 0:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 0:06 Rebase Question Andrew Ottaviano
2021-05-12 0:23 ` Jacob Keller
2021-05-12 0:29 ` Bryan Turner
2021-05-12 0:44 ` Jeff King [this message]
2021-05-12 6:22 ` Junio C Hamano
2021-05-12 7:23 ` Felipe Contreras
-- strict thread matches above, loose matches on Subject: below --
2011-03-11 19:57 rebase question Ryan Sun
2011-03-13 1:05 ` Martin von Zweigbergk
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=YJsk49WBd27NrCAA@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=andrew_o1995@live.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
/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).