Git-Training-Hub/git-practice-ash
22
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ASSIGNMENT-04-09-2025.md

Browse Source
This commit is contained in:
ashish.livingston
2025-09-11 05:28:18 +00:00
parent b18c3dc2fe
commit 198f74a340
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ASSIGNMENT-04-09-2025.md
View File

@ -1,5 +1,4 @@
Part 1: Viewing File History Part 1: Viewing File History
![Screenshot](11g.png) ![Screenshot](11g.png)
@ -22,7 +21,7 @@ git blame → shows commit, author, timestamp per line.
Part 3: Merging Branches 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). 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? What does git log --graph --oneline --all show after the merge?
It shows the branching structure and how the merge happened: It shows the branching structure and how the merge happened: