subversion merge back to trunk
Posted
by
Berryl
on Stack Overflow
See other posts from Stack Overflow
or by Berryl
Published on 2011-01-06T16:59:56Z
Indexed on
2011/01/06
18:53 UTC
Read the original article
Hit count: 303
svn
|tortoisesvn
I set up a branch several weeks ago. When some changes were made to the trunk, SVN was committing to the branch, and not the trunk. The changes were minor and applicable to the branch anyway, so I assumed this is how the branch should work.
Now that the branch work is finished, I merged back the branch back to my working trunk, assuming SVN would replace the old trunk with the new branch in the repository as well. That is not the case though. My repository trunk is out of date.
I would like to make the repository trunk be same as the branch and then delete the branch.
How can I do this?
Cheers,
Berryl
Note: I am using tortoise / visualvsn client.
© Stack Overflow or respective owner