On Thu, Mar 17, 2011 at 20:15, Jeff King <peff@xxxxxxxx> 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... -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html