Question

尝试学习SVN的基础知识（目前使用SilkSVN命令行）。我创建了一个冲突，做了“SVN Update”并选择了Merge，然后“（2）使用你的版本。它说”完成了“Sample1.ps1”的合并。但随后它将菜单放回屏幕并想要选择其他选项。冲突中只有一个文件。合并后为什么更新没有成功完成？

c：\ Code \ Demo＆gt; svn commit -m“测试冲突” 发送Sample1.ps1 svn：E155011：提交失败（详情如下）： svn：E155011：文件'C：\ Code \ Demo \ Sample1.ps1'已过期 svn：E160028：文件'/Sample1.ps1'已过期

c:\Code\Demo>svn update
Updating '.':
C    Sample1.ps1
Updated to revision 5.
Conflict discovered in file 'Sample1.ps1'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
        (mc) my side of conflict, (tc) their side of conflict,
        (s) show all options: m
Merging 'Sample1.ps1'.
Conflicting section found during merge:
(1) their version (at line 6)         |(2) your version (at line 6)
--------------------------------------+--------------------------------------
Write-Host "The Demo2 Change End"     |Write-Host "The End - Some other Demo
--------------------------------------+--------------------------------------
Select: (1) use their version, (2) use your version,
        (12) their version first, then yours,
        (21) your version first, then theirs,
        (e1) edit their version and use the result,
        (e2) edit your version and use the result,
        (eb) edit both versions and use the result,
        (p) postpone this conflicting section leaving conflict markers,
        (a) abort file merge and return to main menu: 2
Merge of 'Sample1.ps1' completed.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
        (r) mark resolved, (mc) my side of conflict,
        (tc) their side of conflict, (s) show all options: s

Answer 1

我只需要为“已解决”选择“R”。我认为合并解决了它，不知道为什么最后一步是必需的。

SVN更新 - 最简单的合并 - 合并后仍然不开心

1 个答案: