Revert "overwriting file with "foo""

This reverts commit ee4cc7eb33adae803bb6ab74c04821c1f13546dc.

diff --git a/test1.txt b/test1.txt
index 257cc5642cb1a054f08cc83f2d943e56fd3ebe99..a93cf0dcc0aaca2b84fef405d14ab75682d3c744 100644 (file)
--- a/test1.txt
+++ b/test1.txt
@@ -1 +1,7 @@
-foo
+This will be my test file. User2 has added some text. User2 add some more text. USER1 non-conflict edit. USER1 edit again.
+
+The second line USER2 ADDED TEXT will be the one that should trigger a conflict.
+
+The thrid line will remain unchanged. USER2 non-conflict text. USER2 edit again.
+
+User2 is going to just add a line, then he will want to regect all of user1's changes and put his version back into the repository. There is probably a fancy and super-complicated "git merge" way of doing this, but since it probably won't come up very often, I would suggest you just manually make a backup of the file, do a pull, overwrite the new file, and do a commit.