svnmergebranchtrunkworking-copy

SVN - Merge working copy into another branch


I started doing a bunch of changes in a branch that should have happened in trunk. I have not committed those changes yet, so my branch has a bunch of uncommitted files.

Trunk shares a same revision as the branch that contains my uncommitted code so it should merge nicely.

Is there a good way to merge my working copy into trunk instead of the branch? I do not want to affect the branch at all.

Thoughts?


Solution

  • You can use svn switch to change the path that your working copy points to. After svn switch, just commit your changes.