From e5c364808a3450f07be78602e192ce4a55c462a9 Mon Sep 17 00:00:00 2001 From: Rohit Date: Sun, 9 Nov 2025 14:43:06 +0530 Subject: [PATCH 1/5] testing conflict1 --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index f77c7f4..0329397 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,5 @@ echo "We are learning Branching" echo "I am learning Devops" echo "Adding new line" echo "I am from Devops and cloud team" -echo "I am DevOps-2" +echo "I am DevOps-2 and testing conflicts" From e90a69b9a444100d78471caa66289ca8e7a415ee Mon Sep 17 00:00:00 2001 From: Rohit Date: Sun, 9 Nov 2025 14:48:19 +0530 Subject: [PATCH 2/5] conflict 2 --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 0329397..83d6fe3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,5 @@ echo "We are learning Branching" echo "I am learning Devops" echo "Adding new line" echo "I am from Devops and cloud team" -echo "I am DevOps-2 and testing conflicts" +echo "I am DevOps-2 and testing conflicts 1" From f12504408d894a72331a21e10b4192847703b493 Mon Sep 17 00:00:00 2001 From: rohitpatil55 Date: Sun, 9 Nov 2025 14:51:22 +0530 Subject: [PATCH 3/5] Update Script2.sh --- Script2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script2.sh b/Script2.sh index 867c7b9..93a5026 100644 --- a/Script2.sh +++ b/Script2.sh @@ -4,4 +4,4 @@ echo "Value of a" read a echo "Value of b" read b -echo "Hello value of a is $a and value of b is $b" +echo "Hello value of a is $a and value of b is $b is" From 880d0efd68710dd04826f1574ae3ea59fe67f322 Mon Sep 17 00:00:00 2001 From: rohitpatil55 Date: Sun, 9 Nov 2025 14:52:53 +0530 Subject: [PATCH 4/5] Fix echo statement formatting in Script2.sh --- Script2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script2.sh b/Script2.sh index 93a5026..b85a2c3 100644 --- a/Script2.sh +++ b/Script2.sh @@ -4,4 +4,4 @@ echo "Value of a" read a echo "Value of b" read b -echo "Hello value of a is $a and value of b is $b is" +echo "Hello value of a is $a and value of b is $b " From f01ff5309f4d1a0efa9bb71442324931d2e2e2e9 Mon Sep 17 00:00:00 2001 From: rohitpatil55 Date: Sun, 9 Nov 2025 14:53:34 +0530 Subject: [PATCH 5/5] Modify output message in Script2.sh --- Script2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script2.sh b/Script2.sh index b85a2c3..3be2111 100644 --- a/Script2.sh +++ b/Script2.sh @@ -4,4 +4,4 @@ echo "Value of a" read a echo "Value of b" read b -echo "Hello value of a is $a and value of b is $b " +echo "Hello value of a is $a and value of b is $b 11"