From b3a8796f786699d7ee19db40b59e99ef935546d8 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Thu, 19 Nov 2015 10:26:28 +0100 Subject: [PATCH] user2's changes --- test1.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test1.txt b/test1.txt index a80adc3..a93cf0d 100644 --- a/test1.txt +++ b/test1.txt @@ -3,3 +3,5 @@ This will be my test file. User2 has added some text. User2 add some more text. 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.34.1