svn branch merge tree conflict issue (using tortoise)
问题 I have read a lot and lot on this but couldn't figure out what the issue is, and it's pretty weird. I am using version 1.7 for server and latest tortoise version (1.7) for the client. Here's the scenario: I created a parent branch, and then created 1 child branch from it. So, PARENT_BRANCH -> CHILD_BRANCH Add a new directory in CHILD_BRANCH and commit. Using tortoise merge all changes from CHILD_BRANCH to PARENT_BRANCH. I used 'merge a range of revisions' option and didn't specify any