From 55e6bd35323b335c4fb06e4eec30b693ae58c748 Mon Sep 17 00:00:00 2001 From: abhijeet Date: Tue, 13 Aug 2019 18:58:56 +0530 Subject: [PATCH 1/4] test commit --- day1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/day1.txt b/day1.txt index cb0f62d..ad31663 100644 --- a/day1.txt +++ b/day1.txt @@ -1,3 +1,4 @@ This is new for online pulling request and merging demo for git training Hello This is Ashish. This is text from next branch +test From 767b989fb5b915fe519e62d573d8a09a0a21dc62 Mon Sep 17 00:00:00 2001 From: abhijeet Date: Tue, 13 Aug 2019 19:08:30 +0530 Subject: [PATCH 2/4] new line at 07:08 --- day1.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/day1.txt b/day1.txt index ad31663..d822f6f 100644 --- a/day1.txt +++ b/day1.txt @@ -2,3 +2,7 @@ This is new for online pulling request and merging demo for git training Hello This is Ashish. This is text from next branch test + + + +new next_branch line From 97280e5c0c03926be356c857511ff6f587ffdeb1 Mon Sep 17 00:00:00 2001 From: abhijeet Date: Tue, 13 Aug 2019 18:58:56 +0530 Subject: [PATCH 3/4] test commit --- day1.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/day1.txt b/day1.txt index b1f8514..ab7a948 100644 --- a/day1.txt +++ b/day1.txt @@ -1,12 +1,12 @@ -This is new for online pulling request and merging demo for git training -<<<<<<< HEAD +iThis is new for online pulling request and merging demo for git training + + Hello This is Ashish. This is text from next branch -======= + Hello Siri. ->>>>>>> This text is added under master node -<<<<<<< HEAD -This line edited by Abhijit in Abhijit branch -======= + Line edited by Abhijit in master node ->>>>>>> Line edited by Abhijit in master node + +test + From 4bacabaf73b64f6501b1d289ee55ea0866fa1348 Mon Sep 17 00:00:00 2001 From: abhijeet Date: Tue, 13 Aug 2019 19:08:30 +0530 Subject: [PATCH 4/4] new line at 07:08 --- day1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/day1.txt b/day1.txt index ab7a948..b8bba3d 100644 --- a/day1.txt +++ b/day1.txt @@ -10,3 +10,4 @@ Line edited by Abhijit in master node test +new next_branch line