Merge a branch with the trunk in Subversion
If you are using Subversion, you most likely have already created (or thinking of creating) branches to manage different versions of your source code.
When the time comes to merge my changes between branches or a branch and the trunk, I always forget the syntax, so here's a small step by step merge execution.
I am assuming you have checked out both the branch and trunk from your subversion repository. If you haven't done so, you can easily checkout with:
First of all, go to the branch main directory, and execute the following:
The last entry is the version number corresponding to the creation of the branch, and looks something like the following:
So, we have found out that the version is 2887. Now, change directory to the trunk, and execute the following command:
The output of this command should be something like:
Basically, that means that we have to merge the changes from revision 2887 to 3117, using the following command:
Now, you should check the changes performed to your local copy, and resolve any change conflicts that may appear.
Once you have verified that the changes are correct, you can check in with the usual svn ci.