SVN - Merge branch to trunk, overwrites some trunk changes / new features

Question

So... I have a problem where I created a branch (0.1) and fixed a few things there, but meanwhile I was working on new things in trunk.

Now I want to merge branch (0.1) to trunk and before commit I did diff and I saw that some changes should be used from trunk not branch (new URLs and new function names for example) but there was no conflict reported.

How do I deal with that? Should I do the reverse merge? -> trunk to the copy of new branch (for example: 0.1-TEST) and then merge new branch (0.1-TEST) back to trunk?

Answer 1

You should always be taking changes from the trunk and merging them into your branch. That way your branch is always as up to date as possible. Having said that if you didn't get conflicts with the first merge, odds are doing it again you are not going to get any conflicts. I know it sucks but you're probably going to have to manually look and remove the changes from the branch that you didn't want in the trunk.