From 2ca44ffff3f254e4052f09bf9c35245d2049f2a6 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Thu, 19 Nov 2015 14:03:39 +0100 Subject: [PATCH] some loops --- test1.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 test1.txt diff --git a/test1.txt b/test1.txt deleted file mode 100644 index a93cf0d..0000000 --- a/test1.txt +++ /dev/null @@ -1,7 +0,0 @@ -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. -- 2.25.1