From: Yang Zhang <yanghatespam@gmail.com>
To: git@vger.kernel.org
Subject: Understanding rebase
Date: Thu, 06 Nov 2008 17:23:28 -0500 [thread overview]
Message-ID: <49136E60.4090605@gmail.com> (raw)
What properties must commits have for them to be rebase-able?
One example arrangement that would cause a rebase to fail is:
- change lines 10, 12, 14 in branch A
- change lines 11, 13, 15 in branch B
These changes are commutative (I believe), but that is insufficient for
avoiding conflicts on a rebaes. For a concrete example of this, see:
http://assorted.svn.sourceforge.net/viewvc/assorted/sandbox/trunk/src/git/gitsvn.bash?revision=1065&view=markup
Another question that probably gets at the same thing: I understand what
rebasing gives me from a high level (rearranging a branch of commits to
be in a series with another branch), but is there a simple explanation
of how, precisely, this is accomplished?
Thanks in advance!
--
Yang Zhang
http://www.mit.edu/~y_z/
reply other threads:[~2008-11-06 22:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=49136E60.4090605@gmail.com \
--to=yanghatespam@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