Added md file

This commit is contained in:
2025-09-18 11:39:14 +05:30
parent 05049ea57f
commit abc73d0ce2
2 changed files with 16 additions and 0 deletions

16
ASSIGNMENT-04-09-2025.md Normal file
View File

@@ -0,0 +1,16 @@
## Q1: Did Git perform a fast-forward merge or a 3-way merge?
Git performed a **3-way merge**.
### Explanation:
- A **fast-forward merge** happens when the branch pointer can just be moved forward because no new commits exist on the target branch since the branching point.
- A **3-way merge** happens when both branches have new commits, and Git needs to create a merge commit by combining changes from both sides.
In my case, both `feature/bugReport` and `feature/mergeFile` had new commits, so Git created a merge commit.
Thus, it was a **3-way merge**.
---
## Q2: What does `git log --graph --oneline --all` show after the merge?
![git log --graph --oneline --all](git_log_--graph_--oneline_--all.png)

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB