From 67cb59fdee5377d16602c0f45eaa23c6075499ea Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 5 Jun 2026 23:23:45 +0530 Subject: [PATCH 1/3] Changes --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index d4e60905..6d69117a 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,4 +1,5 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" echo "We are learning Branching" -echo "I am learning Git" \ No newline at end of file +echo "I am learning Git" +echo "I am learning GitHub from today onwards" From 41b9a1a304409d2067061d534b9c075a83ef7360 Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 6 Jun 2026 23:43:51 +0530 Subject: [PATCH 2/3] branch1 changes done --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 6d69117a..d757e2bc 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,4 @@ echo "We are from batch-33 and learning git/gihub" echo "We are learning Branching" echo "I am learning Git" echo "I am learning GitHub from today onwards" +echo "" I am learning merge conflict" From b54b1d6e3509401451f6f83ddc37294bd06d4950 Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 6 Jun 2026 23:46:09 +0530 Subject: [PATCH 3/3] changes done for branch2 --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 6d69117a..d4f5df22 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,5 @@ echo "We are from batch-33 and learning git/gihub" echo "We are learning Branching" echo "I am learning Git" echo "I am learning GitHub from today onwards" +echo "I am learning merge conflict" +echo "I am learning GitHub from today onwards" \ No newline at end of file