So bob and alice are working on a file and they run into conflict here. Im wondering what the -1,7,1,15 mean. The +<<<<.mine sign, and the +>>>>>.r sign. How would the answers be different if Alice and Bob ran (mc) for each, and how did you find the answer out(without running it)? The file is below.
@@ -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.