From f96ab1d4731a63badbb963eb601ad29fbbcdd5e8 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Thu, 19 Nov 2015 10:21:24 +0100 Subject: [PATCH] user 1 did something not very nice, deleting all lines of the file and adding a new line user 2 doesn't want --- test1.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test1.txt b/test1.txt index f4be4fd..1f180fa 100644 --- a/test1.txt +++ b/test1.txt @@ -1,5 +1 @@ -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 +User1 is going to add stuff to the file, and delete a bunch too! -- 2.25.1