safakhan26 · safakhan26 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023
diff --git a/hello.txt b/hello.txt
@@ -0,0 +1,3 @@
+I have added this new file
+commit for mixed
+new commit for 3merging
diff --git a/pr-example.txt b/pr-example.txt
@@ -0,0 +1 @@
+this is pull request
diff --git a/rebasingbranch.txt b/rebasingbranch.txt
@@ -0,0 +1 @@
+rebasing file
diff --git a/test-branch1.txt b/test-branch1.txt
@@ -0,0 +1,8 @@
+this is the branch1
+<<<<<<< HEAD
+Hello from resolvingbranch
+Hello from main 
+=======
+Hello from resolvingbranch
+>>>>>>> resolvingbranch
+rebasing file
diff --git a/test-branch2.txt b/test-branch2.txt
@@ -0,0 +1 @@
+this is the branch2