Added images for merge conflicts

ASSIGNMENT-04-09-2025.md

@@ -45,3 +45,32 @@
 
 ## What extra information does -e provide?
    To get the email id of the user who made the chages in the file.
+
+## Merging Branches
+
+![alt text](<fast-forward merge-1.png>)
+
+![alt text](<fast-forward merge-2.png>) 
+
+## Merge Conflict 
+
+![alt text](<add number in main and training branch.png>)
+
+![alt text](<merge conflict.png>)
+
+![alt text](<merge conflict1.png>)
+
+## Did Git perform a fast-forward merge or a 3-way merge?
+
+Perform fast-forward merge and merge conflict
+
+## What does git log --graph --oneline --all show after the merge?
+
+![alt text](<git log--graph--oneline--all.png>)
+
+## git log --graph --oneline --all after Merge conflict
+
+![alt text](<git log graph oneline after merge conflict.png>)
+
+
+

file.txt

@@ -1,2 +1,10 @@
-hello
-Hi
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10