SVN更新-最简单的合并-合并后它仍然不高兴

目前正在尝试使用SilkSVN命令行学习SVN的基础知识。我创建了一个冲突，进行了SVN更新并选择了合并，然后2使用您的版本。它说Sample1.ps1的合并已经完成。但随后它将菜单放回屏幕，并希望选择另一个选项。只有一个文件发生冲突。为什么合并后更新没有成功完成

c:\Code\Demo>svn提交-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

---

我只需要为解决问题选择R。我认为合并解决了这个问题，但不确定为什么需要最后一步

svn启动后，我通常会选择推迟并自己手动解决问题。然后，使用svn resolved将文件标记为已解析。我不喜欢在更新过程中试图解决问题。