From: Jonathan Nieder <jrnieder@gmail.com>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
Git List <git@vger.kernel.org>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Sverre Rabbelier <srabbelier@gmail.com>
Subject: Re: [GSoC 2011] Git Sequencer
Date: Sun, 3 Apr 2011 15:08:39 -0500 [thread overview]
Message-ID: <20110403200839.GG3830@elie> (raw)
In-Reply-To: <1301857622.3448.134.camel@lambda>
Stephan Beyer wrote:
> I want to mention an issue that I have not foreseen before: merges.
> (You need merges, for example, when doing rebase -i -p ... -p as in
> --preserve-merges.)
>
> When I began, there was code in the "next" branch that added the TODO
> instructions "mark", "reset" and "merge" to do merges properly and I
> based my work on it. The original pieces by Jörg Sommer can still be
> found here:
> http://repo.or.cz/w/git/sbeyer.git/shortlog/6fabd85e8a777c26f3ae8ce11cb7f4265502ea7f
[etc]
Some more pointers:
http://thread.gmane.org/gmane.comp.version-control.git/148059
IIRC there's some rough consensus about the design, even if I'm not
sure what it is :).
Of course a dream would be a way to rebase merge conflict resolutions
instead of being limited to replaying conflict-free merges or
resolving conflicts by hand. But that's a more complex story.
next prev parent reply other threads:[~2011-04-03 20:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-03 17:20 [GSoC 2011] Git Sequencer Ramkumar Ramachandra
2011-04-03 17:24 ` Sverre Rabbelier
2011-04-03 19:07 ` Stephan Beyer
2011-04-03 20:00 ` Ramkumar Ramachandra
2011-04-03 20:08 ` Jonathan Nieder [this message]
2011-04-03 19:49 ` Daniel Barkalow
2011-04-04 4:06 ` Ramkumar Ramachandra
2011-04-04 4:54 ` Ramkumar Ramachandra
2011-04-04 18:59 ` Daniel Barkalow
2011-04-05 17:50 ` Ramkumar Ramachandra
2011-04-05 18:24 ` Daniel Barkalow
2011-04-05 18:59 ` Ramkumar Ramachandra
2011-04-04 4:43 ` Christian Couder
2011-04-04 5:20 ` Junio C Hamano
2011-04-05 6:23 ` Christian Couder
2011-04-05 6:46 ` Ramkumar Ramachandra
2011-04-04 16:57 ` Ramkumar Ramachandra
2011-04-05 20:00 ` [GSoC 2011 v2] " Ramkumar Ramachandra
2011-04-06 8:11 ` Christian Couder
2011-04-06 9:01 ` Ramkumar Ramachandra
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110403200839.GG3830@elie \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=srabbelier@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).