From a965b3cc37f8669104eca74c4d88ab5298f783bc Mon Sep 17 00:00:00 2001 From: Visakh SA Date: Sun, 24 Nov 2024 23:58:33 +0530 Subject: [PATCH 1/6] commiting line1 --- sample.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sample.py b/sample.py index ad35e5a..94cb331 100644 --- a/sample.py +++ b/sample.py @@ -1 +1,2 @@ print("Hello World") +print("dummy line1") \ No newline at end of file From d7b8fd2f741f4b2e778129da50039cdeb6675bd4 Mon Sep 17 00:00:00 2001 From: Visakh SA Date: Sun, 24 Nov 2024 23:59:48 +0530 Subject: [PATCH 2/6] commiting line2 --- sample.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sample.py b/sample.py index 94cb331..b4d6dbd 100644 --- a/sample.py +++ b/sample.py @@ -1,2 +1,3 @@ print("Hello World") -print("dummy line1") \ No newline at end of file +print("dummy line1") +print("dummy line2") \ No newline at end of file From b91e092c7e760cd0f7de8995e2cfb6da37921a54 Mon Sep 17 00:00:00 2001 From: Visakh SA Date: Mon, 25 Nov 2024 00:13:25 +0530 Subject: [PATCH 3/6] commiting line3 --- sample.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sample.py b/sample.py index b4d6dbd..3788619 100644 --- a/sample.py +++ b/sample.py @@ -1,3 +1,4 @@ print("Hello World") print("dummy line1") -print("dummy line2") \ No newline at end of file +print("dummy line2") +print("dummy line3") \ No newline at end of file From 09b05204f59cc1fa8a9486df6b151beccd934f34 Mon Sep 17 00:00:00 2001 From: Visakh SA Date: Mon, 25 Nov 2024 00:17:24 +0530 Subject: [PATCH 4/6] reverting back to old commit1 --- sample.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/sample.py b/sample.py index 3788619..ad35e5a 100644 --- a/sample.py +++ b/sample.py @@ -1,4 +1 @@ print("Hello World") -print("dummy line1") -print("dummy line2") -print("dummy line3") \ No newline at end of file From 77840d4fc628edb00c1b88a14c2fba1d4615efe4 Mon Sep 17 00:00:00 2001 From: Visakh SA Date: Mon, 25 Nov 2024 00:20:08 +0530 Subject: [PATCH 5/6] reverting back to old commit3 --- sample.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sample.py b/sample.py index ad35e5a..3788619 100644 --- a/sample.py +++ b/sample.py @@ -1 +1,4 @@ print("Hello World") +print("dummy line1") +print("dummy line2") +print("dummy line3") \ No newline at end of file From f33f84971b001618c7cd4a7e3779f865162a7693 Mon Sep 17 00:00:00 2001 From: Visakh SA Date: Mon, 25 Nov 2024 00:47:44 +0530 Subject: [PATCH 6/6] resolving merge conflict --- sample.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sample.py b/sample.py index 3788619..3d8f333 100644 --- a/sample.py +++ b/sample.py @@ -1,4 +1,5 @@ print("Hello World") +print("change added to bring merge conflict") print("dummy line1") print("dummy line2") print("dummy line3") \ No newline at end of file