From: Joshua Jensen <jjensen@workspacewhiz.com>
To: Jeff King <peff@peff.net>
Cc: Jay Soffian <jaysoffian@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Sharing a massive distributed merge
Date: Wed, 23 Mar 2011 21:03:40 -0600 [thread overview]
Message-ID: <4D8AB48C.9080302@workspacewhiz.com> (raw)
In-Reply-To: <20110318054934.GA7547@sigill.intra.peff.net>
Thank you, everyone, for all the feedback. It still isn't clear to me
how we can only resolve part of a merge and easily throw away all the
other files, but we moved forward by just committing the conflict
markers and resolving from there.
Josh
next prev parent reply other threads:[~2011-03-24 3:03 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 [this message]
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
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=4D8AB48C.9080302@workspacewhiz.com \
--to=jjensen@workspacewhiz.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.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).