From: Joshua Jensen <jjensen@workspacewhiz.com>
Date: Thu, 24 Mar 2011 03:03:40 GMT
Subject: Re: Sharing a massive distributed merge
Message-ID: <4D8AB48C.9080302@workspacewhiz.com>
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