SVN show diff 命令混淆

Question

假设 Bob 和 Alice 创建了一个集中式 svn 存储库。他们都有一个名为 b.txt 的文件。 Alice 编辑了它并首先提交了副本。 Bob 然后 edited/updated 它并意识到存在冲突。他执行了 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.

爱丽丝的档案里有什么？鲍勃的档案里有什么？

爱丽丝的：

This is going to be tricky

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

鲍勃的

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

有人能告诉我我说得对吗？

+ 是什么意思？ >>>>> 是什么意思？ +==== 是什么意思？我不知道这方面的资源

Answer 1

首先，您可以使用 interactive conflict resolution tool。它将帮助您在不处理冲突标记的情况下解决冲突。

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

SVNBook | Manual conflict resolution

SVN show diff 命令混淆

SVN show diff command confusion

svn