Reformatted excerpts from nicolas.pouillard's message of 2009-03-18: > This patch conflict with the undo feature, I've locally resolved the > merge. However I don't really know what the best way to share the > conflict resolution.
That's a good question. For some reason git format-patch doesn't produce anything for merge commits, even if they contain conflict resolution changes. Maybe it's for a good reason; I don't know. But you can use git diff. After merging and resolving the conflict, if you do "git diff HEAD^", that should output the conflict-resolution changes. You can send that to me and I can use it to replicate the commit. -- William <[email protected]> _______________________________________________ sup-talk mailing list [email protected] http://rubyforge.org/mailman/listinfo/sup-talk
