SVN显示diff命令混乱

Question

让我们说Bob和Alice创建了一个集中的svn存储库。它们都有一个名为b.txt的文件。 Alice编辑了它并首先提交了副本。鲍勃然后编辑/更新它并意识到冲突。他做了svn diff命令并得到了这个：

This is going to be tricky.

Yes it will be.
It really will be.
+<<<<<<<.mine
+Bob tried to fix the file.
.I'm sure.
+========
+Alice is changing much.
+I'm sure of that
+ >>>>>>.r[5]
+:( What happened?

+Best of luck!

Best of luck!
+This is a mess.

Alice的文件是什么？ Bob的文件是什么？

爱丽丝＆＃39; S：

This is going to be tricky

Yes it will be.
It really will be.
Alice is changing much.
I'm sure of that

鲍勃＆＃39; S

This is going to be tricky

Yes it will be.
It really will be.
Bob tried to fix the file.
I'm sure
:( What happened?

Best of luck!
Best of luck!
This is a mess

有人可以告诉我，我是对吗？

+是什么意思？什么＆gt;＆gt;＆gt;＆gt;＆gt;意思？ + ====是什么意思？我不知道这个资源

Answer 1

首先，您可以使用interactive conflict resolution tool。它将帮助您解决冲突，而无需处理冲突标记。

如果您仍想手动解决冲突，请阅读文档：

• SVNBook | Manual conflict resolution