From 2acf1dea869548b37b83b1acc9bdf4baffb7dbc7 Mon Sep 17 00:00:00 2001 From: Magdel Date: Thu, 11 Sep 2025 06:47:06 +0000 Subject: [PATCH] Update ASSIGNMENT-04-09-2025.md Solved merge conflict --- ASSIGNMENT-04-09-2025.md | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/ASSIGNMENT-04-09-2025.md b/ASSIGNMENT-04-09-2025.md index 2f494aa..f9a4f59 100644 --- a/ASSIGNMENT-04-09-2025.md +++ b/ASSIGNMENT-04-09-2025.md @@ -300,11 +300,26 @@ Automatic merge failed; fix conflicts and then commit the result. Questions to answer in your notes: - Did Git perform a fast-forward merge or a 3-way merge? - What does git log --graph --oneline --all show after the merge? +##### Did Git perform a fast-forward merge or a 3-way merge? + 3-way merge. Changes were made independently on both branches before merging, which also lead to a merge conflict. The changes from both branches were combined instead of moving on to another, making it a 3-way merge. - - - - -# \ No newline at end of file +##### What does git log --graph --oneline --all show after the merge? +``` +Magdel@LAPTOP-NS5FVUS9 MINGW64 ~/git-assignment-3 (master) +$ git log --graph --oneline --all +* 6c2c6ba (HEAD -> master) Resolved nerge conflict +|\ +| * 17db618 (feature/feature-1) Update from feature branch +* | 4e58622 New Update from Main branch +|/ +* 1c07bef Add paragraph +* 08aefdc First heading +* 7cb8341 add title +* c5c8519 Intro +* 9ab884e add content 2 +* dd4e73e add Content +* c9c4906 New Changes +* 5cbabdb V1 text +* adfd713 New text +* c53de28 Create new file and add text +```