SVN/MergingFromTrunkToBranch

SVN: merging from the trunk to the branch

This page describes merging from the trunk back into your branch, to prepare for a merge back into trunk or to pick up new features in the trunk.

Read this page first: ​SVN Book: Branching and Merging. We are in the 'Reintegrating a branch' section.

As an example, we are using the trunk copy ^/src/forkliftreader_linux.

• First, make sure all your code is checked in.

svn commit

• Make sure your copy of your branch is up-to-date.

svn update

• Make sure there are no outstanding changes or merges

svn status

• Merge the trunk in.

svn merge --reintegrate ^/src/forkliftreader_linux

• Check in code, or continue working as necessary. A final commit will be required if, e.g. you want to merge any final changes/merged code back into the trunk.