Question: Problem StatementHooli Co . hasput Harry and Kane to implement a new set of features in their feature software. Both started working separately, making their
Problem StatementHooli Co hasput Harry and Kane to implement a new set of features in their feature software. Both started working separately, making their own copies of the same source code. Now, it has become difficult for them to track the changes theyve made in the original code,and they are finding it difficult to merge their code together.Action ItemsCreate two separate branches from master Make changes in the same function of the source code in both the branches Merge branch into the masterTry and merge branch into themastermerge conflict should ariseInstall a merge tool of your choice and resolve the merge conflict usinggit mergetool command
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
