Status: WontFix

Comment #9 on issue 2494 by trowb...@gmail.com: Merge conflict resolutions cannot be reviewed (`git diff-tree --cc` diffs don't parse)

It's not hard to make review board parse these diffs, but unfortunately, 'patch' doesn't know what to do with them and the git patch tools (apply, am) don't allow us to isolate individual orig files the way patch does.

I suggest you generate your merge conflict diffs by comparing your new commit against one of its parents directly.

You received this message because this project is configured to send all issue notifications to this address.
You may adjust your notification preferences at:

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 reviewboard-issues+unsubscr...@googlegroups.com.
To post to this group, send email to reviewboard-issues@googlegroups.com.
Visit this group at http://groups.google.com/group/reviewboard-issues.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to