Question: Problem 4 . 1 * abc 1 2 3 4 ( HEAD - > main ) Merge branch 'release - 1 . 0 ' |
Problem
abcHEAD main Merge branch 'release
defrelease Merge branch 'featureb into release
ghifeatureb Add feature B
jkl Prepare for release
mno Continue development on main
pqr Merge branch 'featurea
stufeaturea Add feature A
vwx Update README
yza Initial commit
Questions:
How many merge commits are there? Identify them.
In what order were the feature branches merged?
Describe the likely workflow that led to this Git history.
Were there any potential merge conflicts? If so between which branches and why?
Step by Step Solution
There are 3 Steps involved in it
1 Expert Approved Answer
Step: 1 Unlock
Question Has Been Solved by an Expert!
Get step-by-step solutions from verified subject matter experts
Step: 2 Unlock
Step: 3 Unlock
