我得到SVN中的树冲突。有点奇怪!svn merge:树冲突怪异
我有标准的树干,分支,标签结构,并遵循多个团队模型。 分支1,店2创建形式躯干和活性平行
步骤如下:
1. Branch1 Work
:newfile.c
加入并致力于在Branch1
2. Merge
:从分支1 - >干线(成功;在躯干添加的文件)
3. Merge
:从中继向下合并 - > Branch2。 (成功;文件在Branch2中添加)
4. Branch2 Work
:执行常规的Branch2工作并提交。
5. Merge
:从店2主干=>这一步会因newfile.c
店2队越来越树冲突的newfile.c
他们还没有触及根本树冲突。 这是为什么发生。任何建议请,这可以避免?这个问题困扰了我很多。
PS:我用TortoiseSVN的客户端1.6.0和TortoiseSVN 1.6.16 - 32位(两者分开使用)
合并误差(上述步骤-5):
>svn merge file:///E:/Treeconflict_test/svnRepo/Branches/Br2 Trunk
--- Merging r3 through r8 into 'Trunk':
C Trunk\src\ARTransactionFeeDto2.java
U Trunk\pom.xml
G Trunk
Summary of conflicts:
Tree conflicts: 1
>svn status Trunk
M Trunk
C Trunk\src\ARTransactionFeeDto2.java
> local obstruction, incoming add upon merge
M Trunk\pom.xml
PFB svn的日志(上述步骤1-4):
>svn log -v file:///E:/Treeconflict_test/svnRepo
------------------------------------------------------------------------
r8 | rohit | 2013-03-05 16:30:35 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
M /Branches/Br2/src/ARTransactionFeeDto2.java
br2 branch changes
------------------------------------------------------------------------
r7 | rohit | 2013-03-05 16:29:34 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
M /Branches/Br2
M /Branches/Br2/pom.xml
A /Branches/Br2/src/ARTransactionFeeDto2.java (from /Trunk/src/ARTransactionF
eeDto2.java:6)
dowm-merge from Trunk to branch-Br2
------------------------------------------------------------------------
r6 | rohit | 2013-03-05 16:26:56 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
M /Branches/Br2/pom.xml
br2 branch changes
------------------------------------------------------------------------
r5 | rohit | 2013-03-05 16:22:26 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
M /Trunk
M /Trunk/pom.xml
A /Trunk/src/ARTransactionFeeDto2.java (from /Branches/Br1/src/ARTransactionFeeDto2.java:4)
up-merge from branch-Br1 to Trunk
------------------------------------------------------------------------
r4 | rohit | 2013-03-05 16:20:48 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
M /Branches/Br1/pom.xml
A /Branches/Br1/src/ARTransactionFeeDto2.java
br1 changes
------------------------------------------------------------------------
r3 | rohit | 2013-03-05 16:19:07 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
A /Branches/Br2 (from /Trunk:2)
created branch br2
------------------------------------------------------------------------
r2 | rohit | 2013-03-05 16:18:57 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
A /Branches/Br1 (from /Trunk:1)
created branch Br1
------------------------------------------------------------------------
r1 | rohit | 2013-03-05 16:18:13 +0530 (Tue, 05 Mar 2013) | 1 line
Changed paths:
A /Branches
A /Tags
A /Trunk
A /Trunk/pom.xml
A /Trunk/src
A /Trunk/src/ARTransactionFeeDelegateResponse.java
A /Trunk/src/ARTransactionFeeDto.java
A /Trunk/src/ResponseARTransFeeDtlsDto.java
initial commit Trunk
------------------------------------------------------------------------
SVN中的树冲突可能如果合并树中的文件**在不同部分**中同时更名并编辑** ** AFAIK – 2013-03-05 11:56:23
...您通常会得到一个详细解释: – 2013-03-05 12:00:54
@ÁlvaroG.Vicario - 不,我**没有得到**的冲突树无论如何 – 2013-03-06 04:16:16