Comment #6 on issue 2494 by manually uploaded git diff-tree --cc produce 'diff file is empty'

guys this is a big deal. merge conflicts exist, and their resolutions involve actual code that needs peer review just as much as any other code.

merge conflict resolutions CANNOT BE REVIEWED WITH REVIEW BOARD.

their are many workable solutions. you could show the changes against the new-parent, or even the old-parent. better still would be to put the (diff of the old and new) on the left and the actual-code-changes on the right. of course, a visual 3-way diff would be best, but probably isnt feasible.

even just popping the diff file in as a 'new file' for review would be enough to get eyeballs on it.

You received this message because you are subscribed to the Google Groups 
"reviewboard-issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
To post to this group, send email to
Visit this group at
For more options, visit

Reply via email to