I'm trying to run a merge with different revisions. We use a two tier codebase approach with trunk and a stable branch and selectively cherry-pick what should be merged.
After merging a few revisions, I have a "Summary of conflicts: Tree conflicts: 2" message. How can I find out which the revisions actually had the tree conflict? The tree conflict messages are also really vague, without telling exactly what the conflict is, which file or folder is missing or whichever reason caused the tree conflict. Is there any way to get the reason of the tree conflict? Regards Emerson
