From: Alex Riesen <raa.lkml@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Jay Soffian <jaysoffian@gmail.com>,
Joshua Jensen <jjensen@workspacewhiz.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Sharing a massive distributed merge
Date: Thu, 17 Mar 2011 20:53:04 +0100 [thread overview]
Message-ID: <AANLkTinu3_ZEfkqyVziE2Z=t-R4j_6zRiddrkXOOvAwe@mail.gmail.com> (raw)
In-Reply-To: <20110317191517.GC20508@sigill.intra.peff.net>
On Thu, Mar 17, 2011 at 20:15, Jeff King <peff@peff.net> wrote:
> On Thu, Mar 17, 2011 at 07:48:54PM +0100, Alex Riesen wrote:
>
>> How about not to record the merge as a merge commit, but
>> just resolve as much as possible, commit _only_ what was
>> resolved, and revert everything else. Including files merged
>> cleanly, as the last merge by maintainer will have to clean
>> merge them anyway. And of course, commit as normal:
>
> But that still has the same problem. You've reverted unresolved files
> back to the pre-merge state, which is the tip of one of the merged
> branches. How does the integrator differentiate that from the case that
> your resolution happened to take one side of a file?
Maybe they're lucky and it just never happens? But yes, of course...
next prev parent reply other threads:[~2011-03-17 19:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-16 20:12 Sharing a massive distributed merge Joshua Jensen
2011-03-17 5:21 ` Jay Soffian
2011-03-17 6:38 ` Jeff King
2011-03-17 7:04 ` Jay Soffian
2011-03-17 7:30 ` Jeff King
2011-03-18 5:49 ` Jeff King
2011-03-24 3:03 ` Joshua Jensen
2011-03-17 8:53 ` Alex Riesen
2011-03-17 14:10 ` Jay Soffian
2011-03-17 14:54 ` Alex Riesen
2011-03-17 17:58 ` Jay Soffian
2011-03-17 18:48 ` Alex Riesen
2011-03-17 19:15 ` Jeff King
2011-03-17 19:53 ` Alex Riesen [this message]
2011-03-17 20:54 ` Junio C Hamano
[not found] ` <10061287.5697.1300343903667.JavaMail.trustmail@mail1.terreactive.ch>
2011-03-17 7:51 ` Where do all the tips go? (Was: Re: Sharing a massive distributed merge) Victor Engmark
2011-03-17 8:01 ` Jeff King
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='AANLkTinu3_ZEfkqyVziE2Z=t-R4j_6zRiddrkXOOvAwe@mail.gmail.com' \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=jjensen@workspacewhiz.com \
--cc=peff@peff.net \
/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).