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 06:48:30 +00:00
parent 82e5680200
commit bde0d9f6b9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,4 +23,5 @@ Part 3: Merging Branches
![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:
It shows the branching structure and how the merge happened:
![Screenshot](s1.png)