From: Johannes Sixt <j.sixt@viscovery.net>
To: Philippe Vaucher <philippe.vaucher@gmail.com>
Cc: "Pitucha, Stanislaw Izaak" <stanislaw.pitucha@hp.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Disappearing change on pull rebase
Date: Fri, 11 Nov 2011 11:04:58 +0100 [thread overview]
Message-ID: <4EBCF34A.3090908@viscovery.net> (raw)
In-Reply-To: <CAGK7Mr6D6-4aNceTDCYTHabA3vnxh+uvQ=GOeS_3nrL9rjmc9w@mail.gmail.com>
Am 11/11/2011 10:50, schrieb Philippe Vaucher:
>> This is by design. Rebase does not rebase merge commits because it is
>> assumed that merge commits only do what their name implies - to merge
>> branches of a forked history. As such, they do not introduce their own
>> changes. Follow this rule, i.e., make your change in a separate non-merge
>> commit, and you are fine.
>
> 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.
-- Hannes
next prev parent reply other threads:[~2011-11-11 10:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 13:15 Disappearing change on pull rebase Pitucha, Stanislaw Izaak
2011-11-10 14:23 ` Kirill Likhodedov
2011-11-10 13:35 ` Pitucha, Stanislaw Izaak
2011-11-11 6:56 ` Johannes Sixt
2011-11-11 9:50 ` Philippe Vaucher
2011-11-11 10:04 ` Johannes Sixt [this message]
2011-11-11 10:08 ` Philippe Vaucher
2011-11-11 16:31 ` 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=4EBCF34A.3090908@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=philippe.vaucher@gmail.com \
--cc=stanislaw.pitucha@hp.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).