diff --git a/ASSIGNMENT-04-09-2025.md b/ASSIGNMENT-04-09-2025.md index 20b9c61..aa75e64 100644 --- a/ASSIGNMENT-04-09-2025.md +++ b/ASSIGNMENT-04-09-2025.md @@ -1,5 +1,4 @@ - Part 1: Viewing File History ![Screenshot](11g.png) @@ -22,7 +21,7 @@ git blame → shows commit, author, timestamp per line. Part 3: Merging Branches -![Screenshot](55g.png) +![Screenshot](55gpng.png) Git performed a 3-way merge because both master and feature/feature-1 had diverging commits on the same file (example.txt). What does git log --graph --oneline --all show after the merge? It shows the branching structure and how the merge happened: \ No newline at end of file