I've got a branch (b) that was made from another branch (a), and I wanted to merge a range of revisions from branch a to branch b, but I get to the following message:
Merging revisions 1654-2691 of http://xyz/svn/inetpub/branches/DevBranch into C:\Branch, respecting ancestry C:\Branch ... C:\Branch One or more conflicts were produced while merging r1777:1868 into 'C:\Branch' -- resolve all conflicts and rerun the merge to apply the remaining unmerged revisions
Any idea what this is about?
Afaict I have multiple conflicts on the same file and I need to resolve step by step, but that sounds awfully painful to a git user. Is there something I am missing? or is there a easier way to do this merge?