Now that you’ve merged your work into the main master branch, you can delete all of the other branches without losing any history because the master branch actually contains all of the work from all of the branches, including the entire history of changes. Step: Confirm that the master branch has your whole history
With the branch-master branch checked out, merge the work from branch-a to branch-master by running $ git checkout -b branch-master Step: Start merging the work into the fake “master” branch Now create a new “branch-master” branch where we will combine everyone’s work $ git checkout planets-before-merge-conflict To create the fake “master” branch, checkout the planets-before-merge-conflict branch which contains the original version of planets.md by running This will let us compare all of the stages of the process before we finish. In normal use, you would merge these changes into the master branch, but for the purposes of this exercise we will create a fake “master” branch. On branch-a there is a commit with the message “sets the correct number of planets” while on branch-b there is a commit with the message “pluto is not a planet.” the commit messages are different AND the commit hashes are different. When you compare these two commits, you should see that both of them have the original commit with the message “planets.md before merge conflict” and that commit hash is the same in both branches but each branch has a different commit after this one. Output the commit history for each branch by running