SVN: How to merge changes

1. If you need to merge your trunk tree changes into your branch tree, then you need to work under branch tree working copy. The combine range should cover the last version you merged into trunk tree and the latest version of your trunk tree.

2. If you want to merge your branch tree changes into your trunk tree, then you need to work under trunk tree working copy. The combine range should cover the last version you merged into branch tree and the latest version of your branch tree.
------------------------------------------------------
1、如果是需要将主线的改动合并到分支上，需要在分支的工作副本下进行合并，合并的范围是需要从主线上上次合并的版本到当前主线上最新的版本。

2、相反，如果是需要将分支的改动合并到主线上，需要在主线的工作副本下进行合并，合并的范围是需要从分支上上次合并的版本到当前分支上最新的版本。