Recovering file by checking out old version of that file

diff --git a/test1.txt b/test1.txt
new file mode 100644 (file)
index 0000000..a93cf0d
--- /dev/null
+++ b/test1.txt
@@ -0,0 +1,7 @@
+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.