diff --git a/ASSIGNMENT-04-09-2025.md b/ASSIGNMENT-04-09-2025.md new file mode 100644 index 0000000..1f0f067 --- /dev/null +++ b/ASSIGNMENT-04-09-2025.md @@ -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) diff --git a/git_log_--graph_--oneline_--all.png b/git_log_--graph_--oneline_--all.png new file mode 100644 index 0000000..9e73c5c Binary files /dev/null and b/git_log_--graph_--oneline_--all.png differ