I have a issue. I am trying to merge a branch back to trunk.The branch has never been merged to trunk.The branch has been renamed couple of times. Now when i merge it stops at a specific revision number (the revision number where the branch was renamed). And when i have a look at a specific file at the revision number it shows all the old data (but the current state of the file has all the recent data). and in turns say its in conflicted state.
Is the above issue due to the fact that we have renamed that branch couple of times or because of the fact we haven't merged it from the day we created it or something else. How can i overcome this issue.
Thanks