From d2acf15678e8a0f064b471688120ca8a2f72bd55 Mon Sep 17 00:00:00 2001 From: AnoopChacko <84466153+AnoopChacko@users.noreply.github.com> Date: Sat, 23 Oct 2021 12:18:23 +0530 Subject: [PATCH 1/6] Delete test1 --- test1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test1 diff --git a/test1 b/test1 deleted file mode 100644 index 8b13789..0000000 --- a/test1 +++ /dev/null @@ -1 +0,0 @@ - From b52788d3a69529440fb8e1eb281c4d402bced490 Mon Sep 17 00:00:00 2001 From: Anoop Chacko Date: Sat, 23 Oct 2021 12:37:11 +0530 Subject: [PATCH 2/6] test3.txt added --- test3.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test3.txt diff --git a/test3.txt b/test3.txt new file mode 100644 index 0000000..e69de29 From 1313361044a0736294565fd558996e3a6836b75d Mon Sep 17 00:00:00 2001 From: AnoopChacko <84466153+AnoopChacko@users.noreply.github.com> Date: Sat, 23 Oct 2021 15:15:48 +0530 Subject: [PATCH 3/6] Update test3.txt --- test3.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test3.txt b/test3.txt index e69de29..0db3b6b 100644 --- a/test3.txt +++ b/test3.txt @@ -0,0 +1,2 @@ +To create merge conflict +edited before second one From df69d6d503ad4a14a37719016fe5029b7441bf18 Mon Sep 17 00:00:00 2001 From: Anoop Chacko Date: Sat, 23 Oct 2021 15:17:41 +0530 Subject: [PATCH 4/6] test3.txt modified --- test3.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test3.txt b/test3.txt index e69de29..679a5d3 100644 --- a/test3.txt +++ b/test3.txt @@ -0,0 +1 @@ +second edited and merged From e515abf86aa7d194fc67f367639a4ea0225be93e Mon Sep 17 00:00:00 2001 From: Anoop Chacko Date: Sat, 23 Oct 2021 15:25:48 +0530 Subject: [PATCH 5/6] test3.txt modified --- test3.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/test3.txt b/test3.txt index c639c29..f7195ef 100644 --- a/test3.txt +++ b/test3.txt @@ -1,3 +1 @@ To create merge conflict -edited before second one - From 0ea91927eacc5af697bfff8e0d63df67584d3f26 Mon Sep 17 00:00:00 2001 From: AnoopChacko <84466153+AnoopChacko@users.noreply.github.com> Date: Sat, 23 Oct 2021 15:26:34 +0530 Subject: [PATCH 6/6] Update test3.txt --- test3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test3.txt b/test3.txt index c639c29..e503f87 100644 --- a/test3.txt +++ b/test3.txt @@ -1,3 +1,3 @@ -To create merge conflict +to resolve merge conflict edited before second one