我知道应该在自己的分支上工作,但几个人都在同一个项目的一条分支上。其中一个开发者进行了提交,我只想使用SVN中最新的内容来更新我的本地副本。运行“svn update”命令后,输出结果如下:
Restored 'index.html'
U somescript.php
Conflict discovered in file.xml'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
有没有一种选项/方法可以覆盖本地更改,从Subversion获取最新文件并忽略所有冲突?我看了一些Stack上的其他帖子,它们都没有回答这个问题。他们说要删除项目并再次检出,如果这是最好的方式,那就这样吧... 但是我想知道为什么不能强制更新,希望能得到更多细节。谢谢!
编辑:
所以我选择了“显示所有选项”:
(s) 显示所有选项:s
(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file
(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list
我猜我应该选择选项'tc'吗?
svn revert
然后执行svn up
。 - halfdan