onsdag 21 januari 2009 20:20:50 skrev Jonathan del Strother: [...] > So, it looks like I need to be way more careful when merging > conflicts. Which leads me to - what tools do you use when studying > conflicts like that? git blame seems the obvious one, for getting the > context of each deletion, but it seems like I need to run it once as > git blame HEAD lines, and once as git blame MERGE_HEAD lines. Is > there something a little more integrated for comparing the origin of > each change from both merge branches simultaneously? > > Would welcome any thoughts on how you guys approach conflict-resolution I think you've illustrated a case for graphical merge resolution tools, i.e. run git mergetool to help resolve the conlicts. It will run a graphical tool for you. The list seems to be: kdiff3 kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge vimdiff None of the tools can run blame in the merge tool also. That would be nice. -- robin -- 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
