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

Added images for merge conflicts

Browse Source
This commit is contained in:
Gokul Subramonian
2025-09-11 10:14:19 +05:30
parent 9657a1ec1c
commit c87ff0ff92
5 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,25 @@
![alt text](<fast-forward merge-2.png>)
## Merge Conflict
![alt text](<add number in main and training branch.png>)
![alt text](<merge conflict.png>)
![alt text](<merge conflict1.png>)
## Did Git perform a fast-forward merge or a 3-way merge?
Perform fast-forward merge and merge conflict
## What does git log --graph --oneline --all show after the merge?
![alt text](<git log--graph--oneline--all.png>)
## git log --graph --oneline --all after Merge conflict
![alt text](<git log graph oneline after merge conflict.png>)