From: Philippe Vaucher <philippe.vaucher@gmail.com>
Date: Fri, 11 Nov 2011 10:08:16 GMT
Subject: Re: Disappearing change on pull rebase
Message-ID: <CAGK7Mr6GHNXLCaP94-peUd2TgBn16boLDVKkniPi-=p_WdV7LA@mail.gmail.com>
In-Reply-To: <4EBCF34A.3090908@viscovery.net>

>> Doesn't this create a problem if you pull, resolve a conflit but do NOT
>> push, then pull --rebase some more commits later on? As I understand
>> it, the conflict resolution commit will be a merge commit and will be
>> thrown away by the git pull --rebase.
>
> You are correct, but it is not a problem: During the rebase, the same
> conflicts will arise as during the merge, and you will be forced to
> resolve them before you can complete the rebase. Therefore, nothing will
> be lost.

Doing the same conflict resolution twice is kinda irritating... but
ok, fair enough.
I guess when you resolve a conflict you're supposed to push to avoid this :)

Philippe