From b158aa1c806a507eb24b3db812e03d0431f714a8 Mon Sep 17 00:00:00 2001 From: Sadhna Date: Sun, 5 Apr 2026 22:56:35 +0530 Subject: [PATCH 1/2] Fix grammatical error in file.txt --- file.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.txt b/file.txt index fe43f72..1b912b0 100644 --- a/file.txt +++ b/file.txt @@ -4,4 +4,4 @@ There changes are to learn that how to resolve conflicts. #This is the sample file. These are the changes in the sample branch so that later we can merge it with the main branch. These are the changes in the main branch so that we can learn how to resolve it. -the changes are made into sample file +the changes is made into sample file From 03531396896859c6684bbd619fa848d97c5c152c Mon Sep 17 00:00:00 2001 From: Sadhna Date: Sun, 5 Apr 2026 22:58:27 +0530 Subject: [PATCH 2/2] Add conflict resolution details to file.txt Added conflict resolution section to file.txt --- file.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file.txt b/file.txt index 1b912b0..c0ed037 100644 --- a/file.txt +++ b/file.txt @@ -4,4 +4,6 @@ There changes are to learn that how to resolve conflicts. #This is the sample file. These are the changes in the sample branch so that later we can merge it with the main branch. These are the changes in the main branch so that we can learn how to resolve it. +CONFLICT RESOLUTION: the changes is made into sample file +the change is made into Sample File