From 9fa7c2994e6a7bb2fe8638f54024c8e6d6f80434 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 20 Oct 2022 09:44:30 +0530 Subject: [PATCH 01/85] fake commit-ticketID --- Script1.sh | 1 + Script2.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 970b10cc..c313d4a5 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,3 +2,4 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" +echo "Welcome to Young Minds" diff --git a/Script2.sh b/Script2.sh index d507e753..febd7122 100644 --- a/Script2.sh +++ b/Script2.sh @@ -6,3 +6,4 @@ echo "Value of b" read b echo "Hello value of a is $a and value of b is $b" echo "This is sample change" +echo "bye" From 8376b0e2692445297592cb83d217f748931cbbfb Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 25 Oct 2022 18:24:06 +0530 Subject: [PATCH 02/85] first commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c313d4a5..536502c7 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" +echo "Best class of AWS/DevOps" \ No newline at end of file From fddbb73816ea01a7e6a7636cb8bd369947a6dbfc Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 27 Oct 2022 09:29:59 +0530 Subject: [PATCH 03/85] this change is for req- REQ660982 --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 536502c7..3b41a169 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,4 +3,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Best class of AWS/DevOps" \ No newline at end of file +echo "Best class of AWS/DevOps" +echo "We are learning git" From bedea444bbf3cee183e525518a5753cb8d8c245d Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Oct 2022 04:49:27 +0000 Subject: [PATCH 04/85] this is my last commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 3b41a169..fca96570 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,3 +5,4 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" +echo "We are done with git" From 5f49d89af27984fb11a167bb821a9be4a36ca72e Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 29 Dec 2022 07:47:10 +0530 Subject: [PATCH 05/85] Update Script12.sh --- Script12.sh | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Script12.sh b/Script12.sh index d75af12d..b66caa21 100644 --- a/Script12.sh +++ b/Script12.sh @@ -1,23 +1,3 @@ -#!/bin/bash -#this script is for if-elif-fi -echo "Please enter value of a" -read a -echo "Please enter vaule of b" -read b -if [ $a == $b ] -then - echo "a is equal to b" -elif [ $a -gt $b ] -then - echo "a is greater than b" -elif [ $a -lt $b ] -then - echo "a is less than b" -else - echo "None of the condition met" -fi -root@ip-172-31-42-137:~/scripts/shellscripts# ^C -root@ip-172-31-42-137:~/scripts/shellscripts# cat script12.sh #!/bin/sh a="abc" b="efg" From 6ed411ca73e9f31cba687757e49ffb99ef54b462 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 30 Dec 2022 08:20:25 +0530 Subject: [PATCH 06/85] I have changed 2 script- script1 & Script2 --- Script1.sh | 1 + Script2.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index fca96570..975ca932 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" +echo "We have started our devops-git/github topic" diff --git a/Script2.sh b/Script2.sh index febd7122..07ff2a22 100644 --- a/Script2.sh +++ b/Script2.sh @@ -7,3 +7,4 @@ read b echo "Hello value of a is $a and value of b is $b" echo "This is sample change" echo "bye" +echo "hi" \ No newline at end of file From a85657f86a165138147a821295ae391bb24787e4 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Mon, 2 Jan 2023 08:03:20 +0530 Subject: [PATCH 07/85] Update Script1.sh --- Script1.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Script1.sh b/Script1.sh index 975ca932..8053a145 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,8 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "We have started our devops-git/github topic" +echo "Hello, How are you?" +echo "Welcome to Young Minds" +echo "Best class of AWS/DevOps" +echo "We are learning git" +echo "We are done with git" From 8e86590d2bbdc3d8bae68e2c67453a5dc389aed9 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Mon, 2 Jan 2023 08:06:40 +0530 Subject: [PATCH 08/85] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 975ca932..0769f2ea 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "We have started our devops-git/github topic" +echo "Hello All, Welcome to AWS/Devops Class" +echo "Hello, How are you?" From a7ab09c878ee0afc434a2b0aa324cbf93e49bb7b Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 3 Jan 2023 07:50:59 +0530 Subject: [PATCH 09/85] This changes are for user request-REQ583298 --- Script1.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Script1.sh b/Script1.sh index 96f27d41..928ba9d7 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,10 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" -echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "Best class of AWS/DevOps" -echo "We are learning git" -echo "We are done with git" - +echo "We have started our devops-git/github topic" \ No newline at end of file From e76d21c17fd88a03ebe11db295f7514cd202c1a8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Jan 2023 02:27:13 +0000 Subject: [PATCH 10/85] This is for fix - Incident ID --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 928ba9d7..bc1cd47e 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,4 +6,5 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" \ No newline at end of file +echo "We have started our devops-git/github topic" +echo "good morning" From af9b7ed0cb0fb70bc19d1a1f660147838fecd675 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:52:52 +0530 Subject: [PATCH 11/85] Update Script12.sh --- Script12.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script12.sh b/Script12.sh index b66caa21..5d3c8bb1 100644 --- a/Script12.sh +++ b/Script12.sh @@ -6,7 +6,7 @@ if [ $a = $b ] then echo "$a = $b : a is equal to b" else - echo "$a = $b: a is not equal to b" + echo "$a != $b: a is not equal to b" fi @@ -14,7 +14,7 @@ if [ $a != $b ] then echo "$a != $b : a is not equal to b" else - echo "$a != $b: a is equal to b" + echo "$a = $b: a is equal to b" fi From 35229074794be6606680b7dcd5c09edaf62f3485 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:53:30 +0530 Subject: [PATCH 12/85] Update Script12.sh --- Script12.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script12.sh b/Script12.sh index 5d3c8bb1..1bca0b03 100644 --- a/Script12.sh +++ b/Script12.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash a="abc" b="efg" From 199edbfd03504e3bd8e29c47b760fb24feddfc86 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:57:26 +0530 Subject: [PATCH 13/85] Update Script13.sh --- Script13.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script13.sh b/Script13.sh index 958a0150..2a534ecf 100644 --- a/Script13.sh +++ b/Script13.sh @@ -9,7 +9,7 @@ if [ $a != $b ] then echo "$a != $b : a is not equal to b" else - echo "$a != $b: a is equal to b" + echo "$a = $b: a is equal to b" fi if [ $a -lt 100 -a $b -gt 15 ] From efa99be49de7af638b391e9b85e04b19a74dcdf7 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 2 Mar 2023 10:09:11 +0530 Subject: [PATCH 14/85] This is my first commit --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index bc1cd47e..fca96570 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,5 +6,3 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" -echo "good morning" From 374d03f5b910f23717f30cf4e95042ff134175aa Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 2 Mar 2023 10:12:31 +0530 Subject: [PATCH 15/85] This is my 2nd commit --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index fca96570..15b8caf3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,5 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" +echo "We have started our devops-git/github topic" +echo "good morning" \ No newline at end of file From 93508e07bc433b189c245616a30ddc5962b3e88f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Mar 2023 03:49:15 +0000 Subject: [PATCH 16/85] This is my todays first commit --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 15b8caf3..fca96570 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,5 +6,3 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" -echo "good morning" \ No newline at end of file From 1fc77b18a55381fdb7cebd12acd7eacd636d3c39 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:00:10 +0530 Subject: [PATCH 17/85] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index fca96570..bdb4112f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" +echo "This example is of branching strategy" From f83565f010de7072a0e6a1bf62b779cf4e86c750 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 7 Mar 2023 20:57:09 +0530 Subject: [PATCH 18/85] We did few changes in test branch --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index bdb4112f..fd58ba8f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" +echo "Hello Batch-16, We are learning Git/Github" +echo "Good Evening" \ No newline at end of file From 03f4d9aa7ba7a449140d7aa46aa5c94348cc8ef0 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 7 Mar 2023 21:00:31 +0530 Subject: [PATCH 19/85] This is another commit --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index bdb4112f..c7f06273 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" +echo "We are changing script1" +echo "We have applied this changes in main branch" From 247a1cf7cdb7c5d754ade9a0953e53dc7576c384 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Mon, 1 May 2023 07:38:32 +0530 Subject: [PATCH 20/85] This is my first commit --- Script1.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 1a87ebf9..3a91e369 100644 --- a/Script1.sh +++ b/Script1.sh @@ -8,7 +8,4 @@ echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" echo "Hello Batch-16, We are learning Git/Github" -echo "Good Evening" -echo "We are changing script1" -echo "We have applied this changes in main branch" From e7d885544df3cdb4801bd44c548674936bacf093 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Mon, 1 May 2023 07:47:12 +0530 Subject: [PATCH 21/85] This is my 2nd commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 3a91e369..235fc2b0 100644 --- a/Script1.sh +++ b/Script1.sh @@ -8,4 +8,5 @@ echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" echo "Hello Batch-16, We are learning Git/Github" +echo "Good morning batch-18" From c8a72e55411b41fb57413ea20173f4ef55486fb3 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 1 May 2023 02:27:18 +0000 Subject: [PATCH 22/85] this is my 3rd commit --- Script19.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 Script19.sh diff --git a/Script19.sh b/Script19.sh new file mode 100644 index 00000000..cc4cf194 --- /dev/null +++ b/Script19.sh @@ -0,0 +1 @@ +new script From 5f8f70290bfa202de3de6e861c51cbcb7b5e22be Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:30:12 +0530 Subject: [PATCH 23/85] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 235fc2b0..4f5c6a90 100644 --- a/Script1.sh +++ b/Script1.sh @@ -9,4 +9,5 @@ echo "We are done with git" echo "This example is of branching strategy" echo "Hello Batch-16, We are learning Git/Github" echo "Good morning batch-18" +echo "I have created a new branch" From 050da8be8183bdd7ebaa484d9fdbd54183f62138 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:40:53 +0530 Subject: [PATCH 24/85] Update Script11.sh --- Script11.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script11.sh b/Script11.sh index d810876d..3d6c1eba 100644 --- a/Script11.sh +++ b/Script11.sh @@ -16,3 +16,5 @@ then else echo "None of the condition met" fi + +echo "I have changed this branch" From d69e7eb2a171c4df7e815b86a5cfb604fea87029 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:50:09 +0530 Subject: [PATCH 25/85] Update Script1.sh --- Script1.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Script1.sh b/Script1.sh index 4f5c6a90..12ae52ef 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,10 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" -echo "We are learning git" -echo "We are done with git" -echo "This example is of branching strategy" -echo "Hello Batch-16, We are learning Git/Github" -echo "Good morning batch-18" -echo "I have created a new branch" From b0c900ac267d2619ab4a00d131397ac17439fbe7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:51:06 +0530 Subject: [PATCH 26/85] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 12ae52ef..41a1bd10 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" +echo "Hello Team" From e959ce0dbbb4f1d1b8176a827a4e6cc02c643f4f Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:52:47 +0530 Subject: [PATCH 27/85] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 41a1bd10..8b8591a9 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,4 +5,4 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "Hello Team" - +echo "My name is Khan" From 5dfd283e99a42297bf8118a747f035c3a8c59b8b Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 2 May 2023 08:20:18 +0530 Subject: [PATCH 28/85] new branch commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 8b8591a9..f5d06d63 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "Hello Team" echo "My name is Khan" +echo "Welcome to devops" From 1d1ed7d38d8d14b005ea92d75f5a6230a5f56417 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 3 May 2023 07:23:56 +0530 Subject: [PATCH 29/85] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index f5d06d63..e9dcee6c 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "Hello Team" echo "My name is Khan" echo "Welcome to devops" +echo "We are learning git" +echo "This batch-18" From c18078c19592a2b1bfdd5b929644899a14a75e8b Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 3 May 2023 07:24:54 +0530 Subject: [PATCH 30/85] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index f5d06d63..0129eb8e 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "Hello Team" echo "My name is Khan" echo "Welcome to devops" +echo "Good morning" + From 41409c98edaa77e998e5ef758a1f8bf3c44d519b Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 3 May 2023 07:40:31 +0530 Subject: [PATCH 31/85] adding --- Script1.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Script1.sh b/Script1.sh index bb4f76d3..b55ba42c 100644 --- a/Script1.sh +++ b/Script1.sh @@ -11,3 +11,7 @@ echo "We are learning git" echo "This batch-18" echo "Good morning" +echo "Welcome to devops" +echo "We are learning git" +echo "This batch-18" +echo "Good morning" From a05aac5381af62c521de7b77ed9bd51871cfd388 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sun, 7 May 2023 17:34:44 +0530 Subject: [PATCH 32/85] Update Script1.sh --- Script1.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Script1.sh b/Script1.sh index b55ba42c..bb4f76d3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -11,7 +11,3 @@ echo "We are learning git" echo "This batch-18" echo "Good morning" -echo "Welcome to devops" -echo "We are learning git" -echo "This batch-18" -echo "Good morning" From aa051acc82a0dcf1e7042de1929a9e84b18e94c4 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sun, 7 May 2023 17:49:05 +0530 Subject: [PATCH 33/85] Update Script1.sh --- Script1.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Script1.sh b/Script1.sh index bb4f76d3..c313d4a5 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,11 +3,3 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Best class of AWS/DevOps" -echo "Hello Team" -echo "My name is Khan" -echo "Welcome to devops" -echo "We are learning git" -echo "This batch-18" -echo "Good morning" - From f4f2156b842dac6c95f3af495151fb8098b05a98 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 12 Jul 2023 09:30:10 +0530 Subject: [PATCH 34/85] This is my commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c313d4a5..c2a7db19 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" +echo "Hello batch-19, We are learning Develops" From c45c9b0ed4bac42fdb692b085b3da95ffd2de107 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 08:50:19 +0530 Subject: [PATCH 35/85] Update Script1.sh --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index c2a7db19..970b10cc 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,5 +2,3 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "Hello batch-19, We are learning Develops" From de2c9330f2725bd6310e402ba155b0c4d205386b Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:04:25 +0530 Subject: [PATCH 36/85] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 970b10cc..c2a7db19 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,3 +2,5 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" +echo "Welcome to Young Minds" +echo "Hello batch-19, We are learning Develops" From a666719db2e20f3d3393e7a8d09a0ddef92a4225 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:52:02 +0530 Subject: [PATCH 37/85] Update Script1.sh --- Script1.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Script1.sh b/Script1.sh index c2a7db19..ff637c7c 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,6 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" +echo "Hello All, Welcome to AWS/Devops Class" +echo "Hello, How are you?" +echo "Welcome to Young Minds" From fe1a81c496cd07f40c13756fbd4c53ff9b6c59ec Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:52:51 +0530 Subject: [PATCH 38/85] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c2a7db19..f54faf04 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" +echo "My name is Rock" From d2777dc05756c450b0047dd2e0e4c6a1c6f5a565 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 14 Jul 2023 03:58:50 +0000 Subject: [PATCH 39/85] testing --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index a85c28b8..2b714f86 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,4 +7,5 @@ echo "Hello batch-19, We are learning Develops" echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "My name is Rock" \ No newline at end of file +echo "My name is Rock" +echo "Hello batch-19" From 0efc2b53bd2ead9c88c29715fe628bc04886de1c Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 15 Sep 2023 07:58:06 +0530 Subject: [PATCH 40/85] This is my fist commit for batch-20 --- Script1.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Script1.sh b/Script1.sh index 2b714f86..4b55ba9b 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,8 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello All, Welcome to AWS/Devops Class" -echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "My name is Rock" -echo "Hello batch-19" +echo "Hello Batch-20" \ No newline at end of file From 12c08642465e6fcd56e247e231729995d329fa8f Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 15 Sep 2023 08:09:12 +0530 Subject: [PATCH 41/85] THis is my 2nd commit --- Script2.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Script2.sh b/Script2.sh index 07ff2a22..4a8343b4 100644 --- a/Script2.sh +++ b/Script2.sh @@ -5,6 +5,4 @@ read a echo "Value of b" read b echo "Hello value of a is $a and value of b is $b" -echo "This is sample change" -echo "bye" -echo "hi" \ No newline at end of file +echo "We are performing this practical for batch-20" From d74b9b5509b14ba435736559ff7483e3740041c3 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:15:07 +0530 Subject: [PATCH 42/85] I am commiting this change in feature branch --- Script1.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 4b55ba9b..c38a1187 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,6 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello Batch-20" \ No newline at end of file +echo "Hello Batch-20" +echo "We are modifying this code in feature" +echo "We are learning branching strategies" \ No newline at end of file From ee1ec8bbfef17962fa3c1c2c43c58aa0885117f5 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:26:43 +0530 Subject: [PATCH 43/85] Fix for ticket INC007896 --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index c38a1187..c502df6b 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,5 +5,5 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" echo "Hello Batch-20" -echo "We are modifying this code in feature" -echo "We are learning branching strategies" \ No newline at end of file +#echo "We are modifying this code in feature" +#echo "We are learning branching strategies" \ No newline at end of file From 4f0334921084cb4301cb1465376e8d826795e54d Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:37:45 +0530 Subject: [PATCH 44/85] I am trying to create merge conflict --- Script1.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index c502df6b..316fba93 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,6 +4,6 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello Batch-20" -#echo "We are modifying this code in feature" -#echo "We are learning branching strategies" \ No newline at end of file +echo "We are trying to help you" +echo "We are creating merge conflict to learn how to solve it" +echo "I am from batch-20." \ No newline at end of file From bb6246d623832463824b25a7baa3f5d03db927dc Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:41:10 +0530 Subject: [PATCH 45/85] Committing this change for merge conflict --- Script1.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 316fba93..2c2e7044 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,6 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "We are trying to help you" -echo "We are creating merge conflict to learn how to solve it" -echo "I am from batch-20." \ No newline at end of file +echo "Hello, how are you?" +echo "we are learning shells script" \ No newline at end of file From 13afd1cd1bbefb239c1f65dbefe11793b1afcb57 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:43:39 +0530 Subject: [PATCH 46/85] Update Script1.sh --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 2c2e7044..e0b72528 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello, how are you?" -echo "we are learning shells script" \ No newline at end of file +echo "We creating this change to test merge conflict" +echo "This is another branch, with differnet user" From 4801d32e33a5a0c4472088f15c8973e33b4d28e7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:45:28 +0530 Subject: [PATCH 47/85] Update Script1.sh --- Script1.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 2c2e7044..cc2a8b38 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,4 +5,6 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" echo "Hello, how are you?" -echo "we are learning shells script" \ No newline at end of file +echo "we are learning shells script" +echo "Hello, how are you?" +echo "Now we will face merge" From 1804762acc87566572c37c3adad16db31621cbf5 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:53:07 +0530 Subject: [PATCH 48/85] Update Script1.sh --- Script1.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Script1.sh b/Script1.sh index 85c3bfbb..f3c85e2f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,8 +4,7 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello, how are you?" -echo "we are learning shells script" -echo "Hello, how are you?" -echo "Now we will face merge" - +echo "husband: Hello, Lets travel Lonavala" +echo "husband: What you say?" +echo "Wife: No, Lets travel Matheran" +echo "husband: No" From 14a57141b8c8cc2b6f8838424fd9b86d66d21012 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:55:54 +0530 Subject: [PATCH 49/85] Update Script1.sh --- Script1.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 85c3bfbb..b03405ed 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,8 +4,8 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello, how are you?" -echo "we are learning shells script" -echo "Hello, how are you?" +echo "wife: Lets travel Matheran?" +echo "husband: No, Lets travel matheran next week" +echo "wife: No" echo "Now we will face merge" From 9ea11720c98ecf409cf96136214c25e8b2904113 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 18 Sep 2023 02:12:08 +0000 Subject: [PATCH 50/85] Deleted 2 lines --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 9ded62d9..c2a7db19 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,3 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "husband: No, Lets travel matheran next week" -echo "Lets travel lonavala this weekend" From 9462321a66b8814ffa630302f073aae3b9445be7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:16:11 +0530 Subject: [PATCH 51/85] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index c2a7db19..07357f15 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,4 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Hello batch-19, We are learning Develops" +echo "Hello batch-20, We are learning Jenkins" From feb0344b3a167b068d31e59f91420c97dbf1da8e Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 18 Nov 2023 08:59:44 +0530 Subject: [PATCH 52/85] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 07357f15..172a52ea 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,4 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Hello batch-20, We are learning Jenkins" +echo "Hello batch-21, We are learning Jenkins" From 1c8299998cdaf0314291ea6d314a53c574ac51fe Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 18 Nov 2023 09:14:30 +0530 Subject: [PATCH 53/85] i am commiting this change as sample --- Script1.sh | 1 + Script8.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Script1.sh b/Script1.sh index 172a52ea..e65db43f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-21, We are learning Jenkins" +echo "We have started Git sessions." diff --git a/Script8.sh b/Script8.sh index 3d246692..2f2626b7 100644 --- a/Script8.sh +++ b/Script8.sh @@ -27,3 +27,5 @@ then else echo "None of the condition met" fi + +echo "We are testing git practical" \ No newline at end of file From df321a93c7321c0376af9d790cebd2758f08c1ef Mon Sep 17 00:00:00 2001 From: root Date: Sat, 18 Nov 2023 03:54:26 +0000 Subject: [PATCH 54/85] Removed fake commits --- Script1.sh | 1 - Script8.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index e65db43f..172a52ea 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,3 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-21, We are learning Jenkins" -echo "We have started Git sessions." diff --git a/Script8.sh b/Script8.sh index 2f2626b7..c8a713cf 100644 --- a/Script8.sh +++ b/Script8.sh @@ -28,4 +28,3 @@ else echo "None of the condition met" fi -echo "We are testing git practical" \ No newline at end of file From 7fc5b3f8432fb2c13edfb2b153655862cc9d94d5 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sun, 19 Nov 2023 08:51:54 +0530 Subject: [PATCH 55/85] We are learning git merge --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 172a52ea..65022588 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-21, We are learning Jenkins" +echo "hello Team, How are you?" From 29141b7874b1855e2290bb32b19338c8393255cb Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 22 Nov 2023 08:55:00 +0530 Subject: [PATCH 56/85] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 65022588..c11b5973 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-21, We are learning Jenkins" -echo "hello Team, How are you?" + From 98a77b2979ef164e93482973a51c67f611e3f27e Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 24 Jan 2024 07:44:07 +0530 Subject: [PATCH 57/85] this is my first commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c11b5973..c587dfc4 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-21, We are learning Jenkins" +echo "Good morning batch-22, We are learning GitHub" From fe5ba34dcaa7e19d0f6b99c5a07d1248e2c2318f Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 24 Jan 2024 07:51:46 +0530 Subject: [PATCH 58/85] This is my sample commit 2nd --- Script2.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Script2.sh b/Script2.sh index 4a8343b4..867c7b9d 100644 --- a/Script2.sh +++ b/Script2.sh @@ -5,4 +5,3 @@ read a echo "Value of b" read b echo "Hello value of a is $a and value of b is $b" -echo "We are performing this practical for batch-20" From cb6b94d7681320efd1f800f65c525bd8876d13b8 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 24 Jan 2024 08:07:43 +0530 Subject: [PATCH 59/85] Modifying Script2 --- Script2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script2.sh b/Script2.sh index 867c7b9d..e0b7686d 100644 --- a/Script2.sh +++ b/Script2.sh @@ -5,3 +5,4 @@ read a echo "Value of b" read b echo "Hello value of a is $a and value of b is $b" +echo "Welcome to DevOps" From ac03604463d29e8ba4408591fcda92b257db2943 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 24 Jan 2024 08:22:33 +0530 Subject: [PATCH 60/85] Request commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c587dfc4..dca795f2 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,4 +5,5 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-21, We are learning Jenkins" echo "Good morning batch-22, We are learning GitHub" +echo "We are learning branching strategies" From 051ec25ade765a50bb5414822a5dfcd4ca8eba53 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Fri, 26 Jan 2024 08:06:43 +0530 Subject: [PATCH 61/85] Update Script1.sh --- Script1.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Script1.sh b/Script1.sh index dca795f2..ff8023c3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,8 +2,4 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "Hello batch-21, We are learning Jenkins" -echo "Good morning batch-22, We are learning GitHub" -echo "We are learning branching strategies" - +echo "We are learning Git" From d8c83534a10ad755dc02574121524e5dcafda1b0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Jan 2024 13:41:41 +0000 Subject: [PATCH 62/85] Adding code --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index ff8023c3..3ce39d31 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "We are learning Git" +echo "We are trying this practical from linux EC2" From c53dd8a959c6566f8f09f0923e50f1ec63b8fb61 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 29 Mar 2024 08:48:06 +0530 Subject: [PATCH 63/85] This is my first commit for batch-23 --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 3ce39d31..e1dcdbba 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "We are learning Git" echo "We are trying this practical from linux EC2" +echo "We are from batch-23 and learning git/gihub" From 20526d5a28af6acebc982ab5c4be088cb436a01d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Mar 2024 03:33:27 +0000 Subject: [PATCH 64/85] 2nd commit for batch-23 --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index e1dcdbba..290b6864 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "We are learning Git" echo "We are trying this practical from linux EC2" -echo "We are from batch-23 and learning git/gihub" +#echo "We are from batch-23 and learning git/gihub" From fd0cefeecfe2fa9103fa3818ce044c2ab2b5dcc4 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Fri, 29 Mar 2024 09:11:45 +0530 Subject: [PATCH 65/85] Update Script1.sh --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 290b6864..c551c94d 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "We are learning Git" echo "We are trying this practical from linux EC2" -#echo "We are from batch-23 and learning git/gihub" +echo "We are from batch-23 and learning git/gihub" +echo "Happy good friday" From 166ad0cceedc97b61a56eb553c7f93afa7d394c7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 30 Mar 2024 08:50:22 +0530 Subject: [PATCH 66/85] Update Script1.sh --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index c551c94d..11fd50b1 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "We are learning Git" echo "We are trying this practical from linux EC2" -echo "We are from batch-23 and learning git/gihub" -echo "Happy good friday" +echo "We are from batch-24 and learning git/gihub" +echo "Happy weekend" From e4279319ba3453563d8113f7ac43bfe13c4aa4a3 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 30 Mar 2024 09:09:12 +0530 Subject: [PATCH 67/85] code changes for req- REQ9865634 --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 11fd50b1..b5f94ce2 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "We are learning Git" echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git/gihub" echo "Happy weekend" +echo "Today is saturday" From 11bb8644e83ba40c2adcdb5c201e627be2067315 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 30 Mar 2024 09:28:28 +0530 Subject: [PATCH 68/85] We have deleted 1 script file --- Script1.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Script1.sh diff --git a/Script1.sh b/Script1.sh deleted file mode 100644 index b5f94ce2..00000000 --- a/Script1.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -#This is my 1st shell script to print output -echo "Hello All, Welcome to AWS/Devops Class" -echo "Hello, How are you?" -echo "We are learning Git" -echo "We are trying this practical from linux EC2" -echo "We are from batch-24 and learning git/gihub" -echo "Happy weekend" -echo "Today is saturday" From f1e4b393e64d0b2f7ed8420f5cc70fdc65e5c6a8 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:31:22 +0530 Subject: [PATCH 69/85] Create script1.sh --- .../script1.sh" | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 "echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" diff --git "a/echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" "b/echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" new file mode 100644 index 00000000..0aad6b36 --- /dev/null +++ "b/echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" @@ -0,0 +1,4 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-24 and learning git/gihub" +echo "Happy weekend" +echo "Today is saturday" From 1f406d000e183bfcf29724195e581401ed30bb60 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:31:48 +0530 Subject: [PATCH 70/85] Delete echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git directory --- .../script1.sh" | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 "echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" diff --git "a/echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" "b/echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" deleted file mode 100644 index 0aad6b36..00000000 --- "a/echo \"We are trying this practical from linux EC2\" echo \"We are from batch-24 and learning git/script1.sh" +++ /dev/null @@ -1,4 +0,0 @@ -echo "We are trying this practical from linux EC2" -echo "We are from batch-24 and learning git/gihub" -echo "Happy weekend" -echo "Today is saturday" From 89b1abbaa295f31b1415af06c57718a4a3f1beae Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:32:09 +0530 Subject: [PATCH 71/85] Create script1.sh --- script1.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 script1.sh diff --git a/script1.sh b/script1.sh new file mode 100644 index 00000000..0aad6b36 --- /dev/null +++ b/script1.sh @@ -0,0 +1,4 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-24 and learning git/gihub" +echo "Happy weekend" +echo "Today is saturday" From 4f047adf217df8c5abaf195d3222df6e6bf1cb70 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:32:44 +0530 Subject: [PATCH 72/85] Update script1.sh --- script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script1.sh b/script1.sh index 0aad6b36..9eb89469 100644 --- a/script1.sh +++ b/script1.sh @@ -1,4 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git/gihub" echo "Happy weekend" -echo "Today is saturday" + From 58d77b0be8afafb89bc296871f402e1923d5860a Mon Sep 17 00:00:00 2001 From: Rajvir Date: Sun, 31 Mar 2024 16:09:16 +0530 Subject: [PATCH 73/85] this is my first commit --- script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script1.sh b/script1.sh index 9eb89469..f2d23bf5 100644 --- a/script1.sh +++ b/script1.sh @@ -1,4 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git/gihub" echo "Happy weekend" - +echo "we are testing-git in lecture 59" From 74ffee07d5a02aa4934f0bd8fe0360de19c89dd8 Mon Sep 17 00:00:00 2001 From: Rajvir Date: Sun, 31 Mar 2024 20:08:34 +0530 Subject: [PATCH 74/85] this is prem dhillon --- Scrpit10.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Scrpit10.sh b/Scrpit10.sh index bb6ae777..916a5e50 100644 --- a/Scrpit10.sh +++ b/Scrpit10.sh @@ -7,4 +7,5 @@ then echo "a is greater than b" else echo "a is smaller than b" +echo " but a is happy than b" fi From c4371bd68b7b96f30646e52bd8428fdbb2720f94 Mon Sep 17 00:00:00 2001 From: sardarji35 <165194342+sardarji35@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:07:27 +0530 Subject: [PATCH 75/85] Create file1 --- file1 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 file1 diff --git a/file1 b/file1 new file mode 100644 index 00000000..1e0a88fe --- /dev/null +++ b/file1 @@ -0,0 +1,4 @@ +1. hi +2. good morning +3. how are you? +4. husband; we have to travel manali in dec From d858c0917712709bef496be5018d90865d13e171 Mon Sep 17 00:00:00 2001 From: sardarji35 <165194342+sardarji35@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:09:11 +0530 Subject: [PATCH 76/85] Update file1 --- file1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1 b/file1 index 1e0a88fe..904f3ce7 100644 --- a/file1 +++ b/file1 @@ -1,4 +1,4 @@ 1. hi 2. good morning 3. how are you? -4. husband; we have to travel manali in dec +4. husband; we have to travel goa in dec From 87368e304d9bcd2638fd0d0f7135e59f726f04c7 Mon Sep 17 00:00:00 2001 From: sardarji35 <165194342+sardarji35@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:17:25 +0530 Subject: [PATCH 77/85] Update file1 --- file1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1 b/file1 index 1e0a88fe..9204b90a 100644 --- a/file1 +++ b/file1 @@ -1,4 +1,4 @@ 1. hi 2. good morning 3. how are you? -4. husband; we have to travel manali in dec +4. husband; we have to travel pune in dec From abc088c4c1b7ab25f9618af30bb63ca3e69dc9ce Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 4 Mar 2025 08:20:12 +0530 Subject: [PATCH 78/85] this is my first commit --- script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script1.sh b/script1.sh index f2d23bf5..db4cb403 100644 --- a/script1.sh +++ b/script1.sh @@ -2,3 +2,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git/gihub" echo "Happy weekend" echo "we are testing-git in lecture 59" +echo "wer are doing mofify" From efd6488a255757c5e6f4deccdcbd8b85bce40888 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 4 Mar 2025 08:59:11 +0530 Subject: [PATCH 79/85] this is my 2nd commit --- script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script1.sh b/script1.sh index db4cb403..430179be 100644 --- a/script1.sh +++ b/script1.sh @@ -3,3 +3,4 @@ echo "We are from batch-24 and learning git/gihub" echo "Happy weekend" echo "we are testing-git in lecture 59" echo "wer are doing mofify" +echo "we are adding new line" From 6bca569aa2ad764a16a140a8d093d2a0b7e34d16 Mon Sep 17 00:00:00 2001 From: sardarji35 <165194342+sardarji35@users.noreply.github.com> Date: Wed, 5 Mar 2025 08:02:15 +0530 Subject: [PATCH 80/85] Update script1.sh --- script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script1.sh b/script1.sh index 430179be..84656b11 100644 --- a/script1.sh +++ b/script1.sh @@ -4,3 +4,4 @@ echo "Happy weekend" echo "we are testing-git in lecture 59" echo "wer are doing mofify" echo "we are adding new line" +echo "we are add 3 line" From 9f4a5478930167af5e2a23b191dd4ef04751c0fe Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 5 Mar 2025 08:24:16 +0530 Subject: [PATCH 81/85] this is code changes fro REQ123456 --- script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script1.sh b/script1.sh index 84656b11..86d646e2 100644 --- a/script1.sh +++ b/script1.sh @@ -5,3 +5,5 @@ echo "we are testing-git in lecture 59" echo "wer are doing mofify" echo "we are adding new line" echo "we are add 3 line" +echo "todya is saturday" +echo "we are adding this line when we are learning branch" From 8c912368ceeaee67ef078dbf96d8a1a4cb361799 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 5 Mar 2025 08:51:02 +0530 Subject: [PATCH 82/85] Please enter the commit message for your changes. Lines starting --- script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script1.sh b/script1.sh index 86d646e2..1274daca 100644 --- a/script1.sh +++ b/script1.sh @@ -7,3 +7,5 @@ echo "we are adding new line" echo "we are add 3 line" echo "todya is saturday" echo "we are adding this line when we are learning branch" +echo "ading new line +" From 764a44c25f34d5d736adbe72fa4f79156fd5a457 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 5 Mar 2025 08:54:28 +0530 Subject: [PATCH 83/85] add comment for new branch --- script1.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script1.sh b/script1.sh index 1274daca..dfb0bb27 100644 --- a/script1.sh +++ b/script1.sh @@ -7,5 +7,4 @@ echo "we are adding new line" echo "we are add 3 line" echo "todya is saturday" echo "we are adding this line when we are learning branch" -echo "ading new line -" +echo "ading new line" From 4c2d620b5155d262256bcf2e6909c2fb981556a7 Mon Sep 17 00:00:00 2001 From: sardarji35 <165194342+sardarji35@users.noreply.github.com> Date: Thu, 6 Mar 2025 07:12:18 +0530 Subject: [PATCH 84/85] Create file2 --- file2 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 file2 diff --git a/file2 b/file2 new file mode 100644 index 00000000..f9ad9de7 --- /dev/null +++ b/file2 @@ -0,0 +1,5 @@ +hi +good morning +how are you +we have to travel +Manali in Dec From e530979e60baa72f83ce9c5bbbfca53d0146360c Mon Sep 17 00:00:00 2001 From: sardarji35 <165194342+sardarji35@users.noreply.github.com> Date: Thu, 6 Mar 2025 07:17:10 +0530 Subject: [PATCH 85/85] Update file2 --- file2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file2 b/file2 index f9ad9de7..c9a6f3b5 100644 --- a/file2 +++ b/file2 @@ -2,4 +2,4 @@ hi good morning how are you we have to travel -Manali in Dec +GOA in Dec