Svn - Merge

> Code - (Programming|Computer) Language > Code Versioning > Svn (Subversion)

1 - Steps

As the trunk is also a branch, the steps below are basically the same but I wanted to keep them apart because it gives a step by step guide for beginners.

1.1 - Merge from the trunk to your branch

  • Commit your work if any
  • Your directory is on the branch otherwise you need to switch.
svn info | grep -i URL
  • Right Click > Tortoise > Merge
  • Merge Type: Merge a range of revisions
  • Merge Revision Range: URL to merge from (trunk), All revisions, Working copy (Default to your current dir)
  • Merge Options: Merge Depth (Working copy) → Test Merge

If conflicts:

  • Open the file with TortoiseMerge, choose the block that you want, see the Merged result and save it
  • Quit TortoiseMerge, mark the conflict as resolved
Advertising

1.2 - Merge from a branch to your trunk

  • Commit your work if any
  • Your directory is on the trunk otherwise you need to switch.
svn info | grep -i URL
  • Right Click > Tortoise > Merge
  • Merge Type: Merge a range of revisions
  • Merge Revision Range: URL to merge from (your branch), All revisions, Working copy (Default to your current dir)
  • Merge Options: Merge Depth (Working copy) → Test Merge

If conflicts:

  • Open the file with TortoiseMerge, choose the block that you want, see the Merged result and save it
  • Quit TortoiseMerge, mark the conflict as resolved