Question: ( (b) A project is using git as its distributed version control system (DVCS). It has one branch, main, that already has 4 commits, A1-A4.

 ( (b) A project is using git as its distributed version

( (b) A project is using git as its distributed version control system (DVCS). It has one branch, main, that already has 4 commits, A1-A4. (i) Briefly explain how a DVCS contributes to team development and software quality. (ii) Starting from the current head of main, a new branch, B, is created and two commits, B1 and B2 are made on this branch. Meanwhile two new commits, A5 and A6, have been made to main since B was created. Sketch the git history at this point, labelling any important features. (iii) With the situation as described in (ii), branch B may be integrated back into main using a 3-way merge, a rebase and fast-forward merge, or a rebase and non-fast-forward merge. For each of these approaches, sketch the git history that would result

Step by Step Solution

There are 3 Steps involved in it

1 Expert Approved Answer
Step: 1 Unlock blur-text-image
Question Has Been Solved by an Expert!

Get step-by-step solutions from verified subject matter experts

Step: 2 Unlock
Step: 3 Unlock

Students Have Also Explored These Related Databases Questions!