Switch from branch to trunk as working copy in SVN (tortoise)

Question

I'm beginner. I created branch from trunk from xxx revision. In my new branch I've made ex 5 commits. I'd like to go back (switch) to xxx revision in trunk and I'd like to see my modificated files as changed in working copy in trunk (they should be in xxx revision and marked as changed - in red colour).

is it possible? How to do that?

Thanks

Answer 1

It is possible to do a merge (minus the red color). That's called merge and TortoiseSVN provides documentation . That said, I prefer to manually merge for small merge jobs. I don't trust the automatic merge entirely.

To manually merge, you check out from the trunk, copy your five changes into that directory and then commit.