From 2e0d203600038d93e323e0c1a6b1d80613f1ad02 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 30 May 2026 17:43:47 +0530 Subject: [PATCH 01/36] this is frist commit --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index d4e60905..1cc7f446 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 "this is my new branch changes" \ No newline at end of file From 54da88261176522616ec51b439c850307cd4ab0f Mon Sep 17 00:00:00 2001 From: Dipak Date: Sun, 31 May 2026 14:17:24 +0530 Subject: [PATCH 02/36] this is first commit --- Script1.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 1cc7f446..f5d097a2 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,4 +2,3 @@ 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" -echo "this is my new branch changes" \ No newline at end of file From d4e3c2dd64b1e82e93d63dd86b61063a1739eb7c Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 1 Jun 2026 14:15:20 +0530 Subject: [PATCH 03/36] this is my first commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index f5d097a2..de9f18fa 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-33 and learning git/gihub" echo "We are learning Branching" echo "I am learning Git" +echo "this is my first commit" From f4a54208950859a24644d6bfb492afd575382740 Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 13:31:09 +0530 Subject: [PATCH 04/36] this is my new branch commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index de9f18fa..31d92e81 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 "this is my first commit" +echo "im learnig the git branching" \ No newline at end of file From 6c192bda5a3ef4e45e0cf2c22d39f0b5bb27e1f9 Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 16:40:28 +0530 Subject: [PATCH 05/36] i deleted 2 lines from script one --- Script1.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Script1.sh b/Script1.sh index 31d92e81..a4745015 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,6 +1,3 @@ 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" -echo "this is my first commit" -echo "im learnig the git branching" \ No newline at end of file +echo "This is my first commit" \ No newline at end of file From bab9f62a5973b4db1fa7a4a78c7a1a443ce3387f Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 17:19:19 +0530 Subject: [PATCH 06/36] hello world --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index a4745015..918a7202 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,3 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "This is my first commit" \ No newline at end of file +echo "This is my first commit" +echo "hello world" \ No newline at end of file From e9439591cf0bc4484213e1669b39418e5e281cab Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 17:22:30 +0530 Subject: [PATCH 07/36] hello_2 --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 918a7202..9f882ca9 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 "This is my first commit" -echo "hello world" \ No newline at end of file +echo "hello world" +echo "hello _2" \ No newline at end of file From f0e1ac8ebd408ff7bc6169175113fba1f594de87 Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 17:52:29 +0530 Subject: [PATCH 08/36] hello world --- Script1.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 9f882ca9..cc8fae73 100644 --- a/Script1.sh +++ b/Script1.sh @@ -1,5 +1,3 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "This is my first commit" -echo "hello world" -echo "hello _2" \ No newline at end of file +echo "hello world" \ No newline at end of file From 67340d1e66179c348aca7828be2c02bedd7ee5b4 Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 18:38:32 +0530 Subject: [PATCH 09/36] i created new file in repo --- MyScript.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 MyScript.sh diff --git a/MyScript.sh b/MyScript.sh new file mode 100644 index 00000000..ca5b57a5 --- /dev/null +++ b/MyScript.sh @@ -0,0 +1 @@ +echo "hello gitHub" \ No newline at end of file From 055660c081f238c1c8e00c3076078c2ce5cd1eca Mon Sep 17 00:00:00 2001 From: Dipak Date: Fri, 7 Aug 2026 21:44:29 +0530 Subject: [PATCH 10/36] this is my second try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index ca5b57a5..387bb6ba 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -1 +1,2 @@ -echo "hello gitHub" \ No newline at end of file +echo "hello gitHub" +echo "this is my second try" \ No newline at end of file From c969a0ab232ef90f94c57d9415da659328f5baa2 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sun, 9 Aug 2026 20:47:26 +0530 Subject: [PATCH 11/36] this is my second try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index 387bb6ba..e929961e 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -1,2 +1,3 @@ echo "hello gitHub" -echo "this is my second try" \ No newline at end of file +echo "this is my second try" +echo "this is my third try" \ No newline at end of file From 2345f2306fa3ae36a838d66b612d718ad4f244b8 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sun, 9 Aug 2026 21:27:51 +0530 Subject: [PATCH 12/36] this is my fourth try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index e929961e..b090a69b 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -1,3 +1,4 @@ echo "hello gitHub" echo "this is my second try" -echo "this is my third try" \ No newline at end of file +echo "this is my third try" +echo "this is my fourth try" \ No newline at end of file From d4f26fad794af4a1d6f2ca3ead014af4d281ab56 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sun, 9 Aug 2026 21:54:08 +0530 Subject: [PATCH 13/36] this is my fourth try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index b090a69b..8088748f 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -1,4 +1,5 @@ echo "hello gitHub" echo "this is my second try" echo "this is my third try" -echo "this is my fourth try" \ No newline at end of file +echo "this is my fourth try" +echo "this is myfourth try -1" \ No newline at end of file From 2f44fb2d74cea893b9cbc9970505f935b3b93c90 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sun, 9 Aug 2026 22:07:28 +0530 Subject: [PATCH 14/36] this is my fifth try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index 8088748f..0122e2e3 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -2,4 +2,5 @@ echo "hello gitHub" echo "this is my second try" echo "this is my third try" echo "this is my fourth try" -echo "this is myfourth try -1" \ No newline at end of file +echo "this is myfourth try -1" +echo "this is my fifth try" \ No newline at end of file From 57b7c7c820a9be0d41124306de9e7c305fdee215 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sun, 9 Aug 2026 22:23:48 +0530 Subject: [PATCH 15/36] this is my sixth try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index 0122e2e3..6b21de97 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -3,4 +3,5 @@ echo "this is my second try" echo "this is my third try" echo "this is my fourth try" echo "this is myfourth try -1" -echo "this is my fifth try" \ No newline at end of file +echo "this is my fifth try" +echo "this is my sixth try" \ No newline at end of file From 74315363a70d1a9c8ff2938a4db104784a038d40 Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 09:16:53 +0530 Subject: [PATCH 16/36] this is my seventh try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index 6b21de97..05df593c 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -4,4 +4,5 @@ echo "this is my third try" echo "this is my fourth try" echo "this is myfourth try -1" echo "this is my fifth try" -echo "this is my sixth try" \ No newline at end of file +echo "this is my sixth try" +echo "this is my seventh try" \ No newline at end of file From efb70785ef1ca04afa78b8c798382a59639e55eb Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 11:12:46 +0530 Subject: [PATCH 17/36] this is my eight try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index 05df593c..54467d29 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -5,4 +5,5 @@ echo "this is my fourth try" echo "this is myfourth try -1" echo "this is my fifth try" echo "this is my sixth try" -echo "this is my seventh try" \ No newline at end of file +echo "this is my seventh try" +echo "this isi my eighth try" \ No newline at end of file From a4080ac54234a1c00af05a7f22aced5eca2800b7 Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 15:21:31 +0530 Subject: [PATCH 18/36] this is dipak conflict file --- ConflictScript.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 ConflictScript.sh diff --git a/ConflictScript.sh b/ConflictScript.sh new file mode 100644 index 00000000..a698c46d --- /dev/null +++ b/ConflictScript.sh @@ -0,0 +1,4 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-33 and learning git/gihub" +echo "hello world" +echo "hello this is dipak" \ No newline at end of file From 2b227ea061ddb23cafd7f9d399a17c996bc37faa Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 15:23:46 +0530 Subject: [PATCH 19/36] this is akshay branch --- ConflictScript.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConflictScript.sh b/ConflictScript.sh index a698c46d..95e96771 100644 --- a/ConflictScript.sh +++ b/ConflictScript.sh @@ -1,4 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" echo "hello world" -echo "hello this is dipak" \ No newline at end of file +echo "hello this is Akshay" \ No newline at end of file From 3d9b1303ac16ddf16ba387c93cf712241149778c Mon Sep 17 00:00:00 2001 From: dipakdesai294-ui Date: Mon, 10 Aug 2026 16:21:18 +0530 Subject: [PATCH 20/36] Delete ConflictScript.sh --- ConflictScript.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 ConflictScript.sh diff --git a/ConflictScript.sh b/ConflictScript.sh deleted file mode 100644 index 95e96771..00000000 --- a/ConflictScript.sh +++ /dev/null @@ -1,4 +0,0 @@ -echo "We are trying this practical from linux EC2" -echo "We are from batch-33 and learning git/gihub" -echo "hello world" -echo "hello this is Akshay" \ No newline at end of file From 8e8b846a3a29078b4952489c83855397455079a3 Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 16:35:03 +0530 Subject: [PATCH 21/36] this is the conflict fie example --- Conflict_Example1.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Conflict_Example1.sh diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh new file mode 100644 index 00000000..cc8fae73 --- /dev/null +++ b/Conflict_Example1.sh @@ -0,0 +1,3 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-33 and learning git/gihub" +echo "hello world" \ No newline at end of file From a5a952f8f28476f9343b0ed9f45e3c66e68269e7 Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 16:58:18 +0530 Subject: [PATCH 22/36] this is akshay --- Conflict_Example1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh index cc8fae73..4ad58f40 100644 --- a/Conflict_Example1.sh +++ b/Conflict_Example1.sh @@ -1,3 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "hello world" \ No newline at end of file +echo "hello world" +echo "thi is akshay" \ No newline at end of file From 6dcb18206ea06a300317aa7ca812a34bfdeb2ace Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 17:00:01 +0530 Subject: [PATCH 23/36] this is dipak --- Conflict_Example1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh index cc8fae73..73f18eb8 100644 --- a/Conflict_Example1.sh +++ b/Conflict_Example1.sh @@ -1,3 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "hello world" \ No newline at end of file +echo "hello world" +echo "this is dipak" \ No newline at end of file From fdd59af71d76ddf98bc7de9b402b5a92c3212159 Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 21:01:01 +0530 Subject: [PATCH 24/36] this is new update --- Conflict_Example1.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh index 8f3c83f7..0706b433 100644 --- a/Conflict_Example1.sh +++ b/Conflict_Example1.sh @@ -1,6 +1,5 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" echo "hello world" -echo "thi is akshay" -echo "this is dipak" + From 573b6979ed735c045b8ecc9ed9bf82758d3da64c Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 21:04:27 +0530 Subject: [PATCH 25/36] this is B1 commit --- Conflict_Example1.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh index 0706b433..c9ac01d6 100644 --- a/Conflict_Example1.sh +++ b/Conflict_Example1.sh @@ -1,5 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" echo "hello world" - - +echo "this is B1" \ No newline at end of file From 4ed2b81155192c73f4bed0b9d2aa899a97f3aa7b Mon Sep 17 00:00:00 2001 From: Dipak Date: Mon, 10 Aug 2026 21:06:15 +0530 Subject: [PATCH 26/36] this is B2 --- Conflict_Example1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh index 0706b433..82ad18a4 100644 --- a/Conflict_Example1.sh +++ b/Conflict_Example1.sh @@ -1,5 +1,5 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" echo "hello world" - +echo "This is B2" From fad71f261b16c6dad650238d1ec36e1ac8be333b Mon Sep 17 00:00:00 2001 From: Dipak Date: Wed, 12 Aug 2026 14:13:33 +0530 Subject: [PATCH 27/36] this is my eighth try --- Conflict_Example1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh index 519d784f..c02c6296 100644 --- a/Conflict_Example1.sh +++ b/Conflict_Example1.sh @@ -3,3 +3,4 @@ echo "We are from batch-33 and learning git/gihub" echo "hello world" echo "This is B2" echo "this is B1" +echo "this is my eighth try" \ No newline at end of file From a8af065a0cd7802996314b98413fcd205069f8eb Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 08:21:51 +0530 Subject: [PATCH 28/36] this is my ninth try --- MyScript.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyScript.sh b/MyScript.sh index 54467d29..dc6de782 100644 --- a/MyScript.sh +++ b/MyScript.sh @@ -6,4 +6,5 @@ echo "this is myfourth try -1" echo "this is my fifth try" echo "this is my sixth try" echo "this is my seventh try" -echo "this isi my eighth try" \ No newline at end of file +echo "this is my eighth try" +echo "this is my ninth try" \ No newline at end of file From e9e8a57c695d7a6d53eab44ff965c6af91812e85 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 12:46:55 +0530 Subject: [PATCH 29/36] i removed conflict file --- Conflict_Example1.sh | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 Conflict_Example1.sh diff --git a/Conflict_Example1.sh b/Conflict_Example1.sh deleted file mode 100644 index c02c6296..00000000 --- a/Conflict_Example1.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "We are trying this practical from linux EC2" -echo "We are from batch-33 and learning git/gihub" -echo "hello world" -echo "This is B2" -echo "this is B1" -echo "this is my eighth try" \ No newline at end of file From cf7debbe325d8a2a52d175c112b2a68e633a11d6 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 12:56:46 +0530 Subject: [PATCH 30/36] this is new conflict file --- Conflict_2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Conflict_2 diff --git a/Conflict_2 b/Conflict_2 new file mode 100644 index 00000000..cc8fae73 --- /dev/null +++ b/Conflict_2 @@ -0,0 +1,3 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-33 and learning git/gihub" +echo "hello world" \ No newline at end of file From 18ed64f45035dd912b6ced5dc7bc54eb8c48c7cc Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 13:03:52 +0530 Subject: [PATCH 31/36] this is akshay --- Conflict_2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Conflict_2 b/Conflict_2 index cc8fae73..433d6670 100644 --- a/Conflict_2 +++ b/Conflict_2 @@ -1,3 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "hello world" \ No newline at end of file +echo "hello world" +echo "this is akshay" \ No newline at end of file From a7f572453830f0ef25c66ab1267701baf1e3bb69 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 21:47:52 +0530 Subject: [PATCH 32/36] edited file --- Conflict_2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Conflict_2 b/Conflict_2 index 433d6670..cc8fae73 100644 --- a/Conflict_2 +++ b/Conflict_2 @@ -1,4 +1,3 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "hello world" -echo "this is akshay" \ No newline at end of file +echo "hello world" \ No newline at end of file From 5a8d9fad69fa0691172520c2741b4f5d37a9bd58 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 21:49:42 +0530 Subject: [PATCH 33/36] deleted conflict file --- Conflict_2 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 Conflict_2 diff --git a/Conflict_2 b/Conflict_2 deleted file mode 100644 index cc8fae73..00000000 --- a/Conflict_2 +++ /dev/null @@ -1,3 +0,0 @@ -echo "We are trying this practical from linux EC2" -echo "We are from batch-33 and learning git/gihub" -echo "hello world" \ No newline at end of file From 57a28b1a18b8cd45d0c892fbe32aca6983cfdad8 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 21:51:17 +0530 Subject: [PATCH 34/36] this is newly created conflict file --- conflict_1 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 conflict_1 diff --git a/conflict_1 b/conflict_1 new file mode 100644 index 00000000..cc8fae73 --- /dev/null +++ b/conflict_1 @@ -0,0 +1,3 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-33 and learning git/gihub" +echo "hello world" \ No newline at end of file From 1b4f7c63ad0b0b150f23c3b89492a9bda33cb4fe Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 21:54:22 +0530 Subject: [PATCH 35/36] this is akshay --- conflict_1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conflict_1 b/conflict_1 index cc8fae73..433d6670 100644 --- a/conflict_1 +++ b/conflict_1 @@ -1,3 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "hello world" \ No newline at end of file +echo "hello world" +echo "this is akshay" \ No newline at end of file From bfbd01d80bad62d0ff80bd187203c27e4c9ea733 Mon Sep 17 00:00:00 2001 From: Dipak Date: Sat, 15 Aug 2026 21:57:06 +0530 Subject: [PATCH 36/36] this is dipak --- conflict_1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conflict_1 b/conflict_1 index cc8fae73..73f18eb8 100644 --- a/conflict_1 +++ b/conflict_1 @@ -1,3 +1,4 @@ echo "We are trying this practical from linux EC2" echo "We are from batch-33 and learning git/gihub" -echo "hello world" \ No newline at end of file +echo "hello world" +echo "this is dipak" \ No newline at end of file