From f67513a8583c044eb4a8d7ea8e0e562948800a4c Mon Sep 17 00:00:00 2001 From: 1023prachu Date: Fri, 14 Jun 2024 15:53:42 +0530 Subject: [PATCH 1/2] create merge conflict --- script1.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script1.sh b/script1.sh index 1d8d019b..c575f9c8 100644 --- a/script1.sh +++ b/script1.sh @@ -2,4 +2,8 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git/gihub" echo "Happy weekend" echo "ssss" - +echo "hkj" +echo "uh;ob" +echo "jhkj;gytdk" +echo "jblbl" +echo "kjhhuy" From 5b38f59c881c79bcf1ecd6d0c5ce503862050724 Mon Sep 17 00:00:00 2001 From: 1023prachu Date: Fri, 14 Jun 2024 15:58:20 +0530 Subject: [PATCH 2/2] create merge conflict to feature 2 --- script1.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/script1.sh b/script1.sh index c575f9c8..030b3137 100644 --- a/script1.sh +++ b/script1.sh @@ -6,4 +6,3 @@ echo "hkj" echo "uh;ob" echo "jhkj;gytdk" echo "jblbl" -echo "kjhhuy"