Once you've done it, merging from a branch to the trunk (or vice versa) in Subversion is a trivial task. But that first time you attempt it, it can seem a little daunting. Here's a quick how-to:
- Let's say you've got a development branch that's all committed and ready to be merged into the trunk. First, switch your working copy to where the result of the merge will ultimately be committed; in this case, the trunk.
- merge from the current location to the location that resembles your desired final result; for us, this is merging from the trunk to the development branch.
- Resolve any conflicts and commit your current working copy.