HowTo:Merge Changes in Subversion

From Resound-wiki

Jump to: navigation, search
[edit]

Merge changes from branch into trunk head

  • Check out trunk head
  • Compare trunk head with branch head and merge differences into local working copy: 
svn merge [trunk head] [branch head] .
svn merge https://resound.svn.sourceforge.net/svnroot/resound/trunk https://resound.svn.sourceforge.net/svnroot/resound/branches/resound-0.1.73 .
  • Check differences in console output and by compiling
  • Commit changes back to trunk
Retrieved from "http://resound.sourceforge.net/wiki/index.php/HowTo:Merge_Changes_in_Subversion"
Personal tools