From: Johannes Sixt <j6t@kdbg.org>
To: Colin Yates <colin.yates@gmail.com>, git@vger.kernel.org
Subject: Re: Please help provide clarity on git rebase internals
Date: Mon, 08 Sep 2014 20:07:32 +0200 [thread overview]
Message-ID: <540DF064.5010907@kdbg.org> (raw)
In-Reply-To: <CAE2xRkHgnXK84u5zeLyVZqAnvu3u+0gSgaB+smFXu6Y7pkY1kQ@mail.gmail.com>
Am 08.09.2014 13:25, schrieb Colin Yates:
> For example, let's imagine that #f1 removed fileA, some time later #d1
Assumption: #d1 is in the branch you call "develop HEAD".
> added a line to that file. If I was doing a merge then of course this
> should be a conflict, however applying #f1 to develop HEAD should work
> even if fileA has changed (i.e. #f1 removes the updated fileA).
No. You should get the very same conflict, because the content that #f1
removed is not identical to the content on develop HEAD anymore.
With rebase you generally get the same conflicts as if you did a merge.
But since rebase applies changes only piece-wise, you get the conflicts
also only piece-wise. (Sometimes you can be lucky that you get no
conflicts due to the nature of changes, sometimes you can also have bad
luck and see more conflicts.)
-- Hannes
next prev parent reply other threads:[~2014-09-08 18:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 11:25 Please help provide clarity on git rebase internals Colin Yates
2014-09-08 18:07 ` Johannes Sixt [this message]
2014-09-19 13:12 ` Fabian Ruch
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=540DF064.5010907@kdbg.org \
--to=j6t@kdbg.org \
--cc=colin.yates@gmail.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).