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

Added images for merge

Browse Source
This commit is contained in:
Ajishini ChandraSekar
2025-09-11 12:28:16 +05:30
parent dc8ae9051e
commit 6d7c4ec657
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,3 +24,13 @@ To view the history of specific lines in a file.
To get the email id of the user who made the chages in the file. To get the email id of the user who made the chages in the file.
## Part 3: Merging Branches
![alt text](<git merge.png>)
## Did Git perform a fast-forward merge or a 3-way merge?
Merge conflict
## What does git log --graph --oneline --all show after the merge?
![alt text](<git log --graph --oneline --all.png>)

BIN
git log --graph --oneline --all.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
git merge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB