17 lines
714 B
Markdown
17 lines
714 B
Markdown
## 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?
|
|
|
|
|