VisualSVN 合并冲突帮助
我正在尝试将功能分支合并回主干，并且我得到了
一个或多个文件处于冲突状态。
矛盾
- C:\Projects\MyaPP\frmMain.vb
C:\Projects\MyaPP\frmMain.Designer.vb 冲突
C:\Projects\MyaPP\Controls\frmView.Designer.vb
以下是所发生事件的简要历史记录。
2011 年 5 月，从主干创建了一个功能分支 (Feature1)。 2011 年 7 月，从主干创建了一个功能分支（Feature2）。
然后上周五，branchs/Feature2 成功合并回主干。然后今天我尝试合并分支/Feature1 我收到上面的错误。
关于我应该如何处理这个问题有什么建议吗？
I am trying to merge a feature branch back to the trunk and I am getting
One or more files are in a conflicted state.
Conflicted
- C:\Projects\MyaPP\frmMain.vb
C:\Projects\MyaPP\frmMain.Designer.vb Conflicted
C:\Projects\MyaPP\Controls\frmView.Designer.vb
Here is a brief history on what happened.
From the trunk, a feature branch (Feature1) was created, in May 2011.
From the trunk, a feature branch (Feature2) was created, in July 2011.
then last Friday, branches/Feature2 was merged back into the trunk successfully. Then today I attempted to merge branches/Feature1 I am getting the error above.
any advice on how I should handle this?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
我没有使用过 VisualSVN，但冲突解决在所有 SVN 客户端中应该是相似的。您应该比较（或“比较”）冲突的文件（在 TortoiseSVN 中右键单击 -> 已解决...，然后右键单击..比较列表中的项目）。滚动浏览文件并将要合并到主干的功能 1 中的行复制到工作副本。当您满意时，保存并保存关闭然后将冲突标记为“已解决”。
希望你能从中推断出来。
I haven't used VisualSVN but conflict resolution should be similar in all SVN clients. You should compare (or 'diff') the conflicted files (in TortoiseSVN its right click-> resolved... and then right click..compare on the items in the list). Scroll through the files and copy over to the working copy the lines from Feature1 you want to merge into the trunk. When you are satisfied, save & close and then mark the conflict as 'resolved'.
Hope you can extrapolate from this.
当您有许多功能分支时，这是正常的。您必须确保要重新集成的分支与主干修订版同步。
当您创建该功能分支 1 时，Subversion 会跟踪最后的修订版本号。由于主干修订已继续，它会尝试对功能分支 1 进行比较和合并。这就是发生冲突的原因。
您需要使用从启动 FB1 到 HEAD 修订版的修订版号从主干到该功能分支进行“svn 合并”，然后解决所有冲突。
要从主干合并到分支，请执行以下步骤：
完成此操作后，您现在可以继续重新集成回主干。
This is normal when you have many feature branches. You have to ensure that the branch that you want to reintegrate back is synchronized with the Trunk revisions.
Subversion tracks the last revision number when you created that Feature Branch 1. Since the trunk revisions have moved on, it then tries to do a diff and merge against the Feature Branch 1. That is why you have conflicts.
You need to do an "svn merge" from the Trunk to that feature branch using the Revision number from the time you started the FB1 up to the HEAD revision and then resolve all the conflicts.
To do the merge from the trunk to the branch, here are the steps:
Once this is done you can now proceed with the reintegration back to the trunk.