1
所以bob和alice正在处理一个文件,他们在这里遇到冲突。我想知道-1,7,1,15是什么意思。 + < < < < .mine符号和+ >>>>>。r符号。如果Alice和Bob每个人都跑(mc),那么答案会有什么不同?你是如何找到答案的(没有跑)?该文件在下面。SVN冲突(mc)和(tc)具体示例
@@ -1,7 +1,15 @@
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[??]
+:(- what happened?
+Best of luck!
-Best of luck!
+This is a mess.