1.用svn 合并分支,主干A(trunk),分支B(branches)
2.如果主干A新建了一个文件提交到trunk 版本号:770
3.分支B合并了(From trunk) 提交到branches 版本号:771 这个没问题
4.但是分支B修改了这个文件提交到branches 版本号772
5.主干A再合并回这个文件(From branches),就会抛树冲突
tree conflict:local add, incoming add upon merge
无法合并分之B修改的内容版本号还是770，这个怎么处理
因为770和771都做了add操作，只要把771忽略掉就行
REM 测试命令
SET REPOPREFIX=file:///%CD:\=/%/
SET REPOROOT=%REPOPREFIX%repo/
REM -----------------------------------------------
REM 创建版本库
REM -----------------------------------------------
svnadmin create repo
svn co %REPOROOT% repo_co
cd repo_co
mkdir trunk
mkdir branches
svn add *
svn ci -m "init"
REM -----------------------------------------------
REM 分支到b1
REM -----------------------------------------------
svn copy %REPOROOT%trunk %REPOROOT%branches/b1 -m "branch 1"
svn update
REM -----------------------------------------------
REM trunk上创建test.txt
REM -----------------------------------------------
cd trunk
echo first>test.txt
svn add test.txt
svn ci -m "new file"
REM -----------------------------------------------
REM 合并到b1
REM -----------------------------------------------
cd ..\branches\b1
svn update
svn merge %REPOROOT%trunk@HEAD .
REM -----------------------------------------------
REM 修改b1上的test.txt
REM -----------------------------------------------
echo second>test.txt
svn ci -m "modify file"
REM -----------------------------------------------
REM 合并回trunk
REM -----------------------------------------------
cd ....\trunk
svn update
svn merge %REPOROOT%branches/b1 .
type test.txt
别用svn了，用git多好！多分支的情况，svn的能力很弱，各种坑，相比之下git更擅长处理多分支