Excerpts from William Morgan's message of Sun Mar 22 22:21:46 +0100 2009: > 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.
I've applied the resolution in a local branch, a attach to patches. The first is done with 'git diff' before commit the conflict resolution. The second is done with 'git diff HEAD^' just after. -- Nicolas Pouillard
undo+multi_edit_labels+remove.patch
Description: Binary data
undo+multi_edit_labels+remove2.patch
Description: Binary data
_______________________________________________ sup-talk mailing list [email protected] http://rubyforge.org/mailman/listinfo/sup-talk
