From ba263a96dd5e91e219eb414322a665a885ba225d Mon Sep 17 00:00:00 2001 From: eyramana Date: Mon, 10 Aug 2026 11:02:29 +0530 Subject: [PATCH 1/4] Add conflict demonstration file --- conflict.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..62694b6 --- /dev/null +++ b/conflict.txt @@ -0,0 +1,2 @@ +hello world +change made in main branch From 22a6fec11c6491f6506b2e4cb1e17b3b5d95863d Mon Sep 17 00:00:00 2001 From: eyramana Date: Mon, 10 Aug 2026 11:07:06 +0530 Subject: [PATCH 2/4] ADD README file --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..ee70d9a --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +Hello world + +this change is made from the main branch' + + + From 8b8bb423f929437f8d095beea40584ba938feae3 Mon Sep 17 00:00:00 2001 From: eyramana Date: Mon, 10 Aug 2026 11:09:23 +0530 Subject: [PATCH 3/4] Update conflict file in feature branch --- conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict.txt b/conflict.txt index 62694b6..47375f1 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,2 +1,2 @@ hello world -change made in main branch +change made in feature branch branch From eaaf4200d2a4fc52da1b9c37007c9f3f997aeb66 Mon Sep 17 00:00:00 2001 From: eyramana Date: Mon, 10 Aug 2026 11:10:31 +0530 Subject: [PATCH 4/4] Update conflict file in main branch --- conflict.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/conflict.txt b/conflict.txt index 62694b6..800d57c 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,2 +1,3 @@ hello world change made in main branch +This is the main branch version \ No newline at end of file