Added images for merge

2025-09-11 12:28:16 +05:30
3 changed files with 10 additions and 0 deletions
--- a/ASSIGNMENT-04-09-2025.md
+++ b/ASSIGNMENT-04-09-2025.md
@ -24,3 +24,13 @@ To view the history of specific lines in a file.

 To get the email id of the user who made the chages in the file.

+## Part 3: Merging Branches
+
+![alt text](<git merge.png>)
+
+## Did Git perform a fast-forward merge or a 3-way merge?
+Merge conflict
+
+## What does git log --graph --oneline --all show after the merge?
+![alt text](<git log --graph --oneline --all.png>)
+
--- a/--all.png
+++ b/--all.png
--- a/merge.png
+++ b/merge.png