From 4b25b387fa6928c9e170a1008afa29454140647b Mon Sep 17 00:00:00 2001 From: Rupali Date: Fri, 7 Nov 2025 17:36:23 +0530 Subject: [PATCH 01/13] my first commit --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index f77c7f4..698e9a7 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,4 +5,4 @@ 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 from yong minds" From 1306aaac29c46c49f5ed4aa45d213c75f96f30e6 Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 21:14:33 +0530 Subject: [PATCH 02/13] Update Script1.sh --- Script1.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 698e9a7..2a0cefa 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,4 @@ 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 from yong minds" + From 5fd08fbc0a65241fb381d9c7d6c3c9fc4bf45d95 Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 21:14:55 +0530 Subject: [PATCH 03/13] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 2a0cefa..7e18e67 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,5 +3,5 @@ echo "We are from batch-25 and learning git/gihub" 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 from Devops team" From c7b23d35c4f2f1813e8ca2d579e292b6abbfb1d8 Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 21:19:32 +0530 Subject: [PATCH 04/13] Update Script1.sh --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 7e18e67..787f785 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,5 @@ echo "We are learning Branching" echo "I am learning Devops" echo "Adding new line" echo "I am from Devops team" - +echo "my chnages for branch2" +echo " Hi ALL" From 6f5b5cea3e02eb57ec5bb8a7d414633a24a4485b Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 21:48:58 +0530 Subject: [PATCH 05/13] Revert "Update Script1.sh" --- Script1.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 787f785..7e18e67 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,4 @@ echo "We are learning Branching" echo "I am learning Devops" echo "Adding new line" echo "I am from Devops team" -echo "my chnages for branch2" -echo " Hi ALL" + From c7ab7d50f07efd06f1a8257255622b5e9b95d7bd Mon Sep 17 00:00:00 2001 From: Rupali Date: Fri, 7 Nov 2025 21:52:08 +0530 Subject: [PATCH 06/13] last commit --- Script1.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Script1.sh b/Script1.sh index 698e9a7..2220f42 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,8 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-25 and learning git/gihub" 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 from yong minds" +echo "I am learning Devops" \ No newline at end of file From 42e428d14d0a1578a1a446e57a7422af3c253b3c Mon Sep 17 00:00:00 2001 From: Rupali Date: Fri, 7 Nov 2025 22:11:33 +0530 Subject: [PATCH 07/13] my last commit --- Script1.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Script1.sh b/Script1.sh index 08409c5..f098401 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,7 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-25 and learning git/gihub" echo "We are learning Branching" -echo "I am learning Devops" -echo "I am learning Devops" -echo "Adding new line" -echo "I am from Devops team" \ No newline at end of file +echo "I am learning Devops" \ No newline at end of file From 5647c6decdd9366fa25002d8d6e74540c3baa9aa Mon Sep 17 00:00:00 2001 From: Rupali Date: Fri, 7 Nov 2025 22:16:32 +0530 Subject: [PATCH 08/13] last commit --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index f098401..de5302b 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-25 and learning git/gihub" -echo "We are learning Branching" -echo "I am learning Devops" \ No newline at end of file +echo "We are learning Branch" +echo "I am learning Devops" \ No newline at end of file From 8fe08d4f527930503ebca2234d3e425bc7cbfa5a Mon Sep 17 00:00:00 2001 From: Rupali Date: Fri, 7 Nov 2025 22:20:21 +0530 Subject: [PATCH 09/13] commit from B1 --- Script1.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index de5302b..3c29004 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,4 +1,6 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-25 and learning git/gihub" echo "We are learning Branch" -echo "I am learning Devops" \ No newline at end of file +echo "I am learning Devops" +echo " to check conflict B1" +echo " for B1" \ No newline at end of file From 1c6b893304a25387282410c828ac191bf6c01ffe Mon Sep 17 00:00:00 2001 From: Rupali Date: Fri, 7 Nov 2025 22:22:44 +0530 Subject: [PATCH 10/13] commit from B2 --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 3c29004..18feddc 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,5 +2,5 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-25 and learning git/gihub" echo "We are learning Branch" echo "I am learning Devops" -echo " to check conflict B1" -echo " for B1" \ No newline at end of file +echo " to check conflict B2" +echo " for B2" \ No newline at end of file From de75276fcface25312ae879d98e20a066a2a6230 Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:27:26 +0530 Subject: [PATCH 11/13] Update Script1.sh --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 3c29004..fb4d982 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,5 +2,5 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-25 and learning git/gihub" echo "We are learning Branch" echo "I am learning Devops" -echo " to check conflict B1" -echo " for B1" \ No newline at end of file +echo " to check conflict B2" +echo " for B2" From 8f8e953eecb4cc5512cddf5c3c61cea478240bae Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:28:48 +0530 Subject: [PATCH 12/13] Update Script1.sh From 388bcc9bba1714c55365ef7ac5b0bc6eaa751b45 Mon Sep 17 00:00:00 2001 From: rup197 <61383301+rup197@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:33:31 +0530 Subject: [PATCH 13/13] Update Script1.sh --- Script1.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Script1.sh b/Script1.sh index 2091a6a..54578e1 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,7 +2,5 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-25 and learning git/gihub" echo "We are learning Branch" echo "I am learning Devops" -echo " to check conflict B2" -echo " for B2" -echo " for B2" - +echo " to check conflict B1" +echo " for B1"