Merging with Subversion

• Why merge? Merging one way or another is the only way to combine two different versions of the code. It can be done manually or using the svn merge command.

• Manually is probably best. Use svn or Winmerge to check for modifications, but combine files using hand edits, ideally with a tool like Winmerge or Emacs.

• Sometimes automatic is more appropriate. For example, if you want to add the new copyright statements and reference to licence.txt into every file in your branch, like the trunk does now, and you have otherwise not changed much in your branch, it is way quicker to use svn merge.

• Svn merge is not what you think. The syntax is not intuiti