main
Switch to the main
branch:
git switch main
In VS Code, note that none of the changes made on the roote-route
branch are present. The code has been reverted to the commit referenced by the main
branch pointer.
Merge the root-route
branch into the main
branch:
git merge root-route
Note that VS Code now contains all the changes made on the root-route
branch.
Run gloga
.
Note that Git was able to automatically merge the root-route
branch into the main
branch. Because the main
branch hadn’t changed since the root-route
branch was forked from it, the merge was trivial: the main
branch pointer merely needed to be moved up to point at the same commit as the root-route
branch pointer. This sort of trivial merge is referred to as a fast-forward merge.
What to submit: Submit to the designated Canvas assignment a screenshot of your desktop that includes your terminal, showing the output of the above gloga
command.