Geek Answers Handbook

Merge uncommitted changes to another branch using SVN

I copied /trunk/project_a to /branches/project_a/test_1 . However, I have not yet created a newly created branch. Then I made some changes to the working copy, which I originally planned to make with the newly created branch. However, after I finished, it seems better to fix these changes in the trunk. (I could then transfer the branch without changes and merge them from the trunk, or I just go back to creating the branch and branch again. This does not really matter.)

My question is : Is there a way to merge uncommitted changes (and from an incomplete branch) into SVN?

+6
svn
source share
2 answers

I think that in your case, the easiest way is to transfer everything where it is and merge it back into the trunk. But if you are really desperate to create a patch file, apply it to the outside line and revert the changes to the branch.

+7
source share

You can try switching the working copy to another branch and then commit the changes.

As far as I know, it's not possible to merge uncommitted changes. svn wants you to specify the range of changes to merge, so that it can calculate the diff to be applied, and you cannot do this without first making the changes.

0
source share

More articles:


All Articles