Homework assignment HW12

Homework log

A homework log is not required for this assignment.

Objectives

Complete chapter 5 of the GitKit book (“Handling Merge Conflicts”).

Likely quiz questions

• Suppose your active branch is wallaby. You have made changes to a file called marsupial.txt, but you have not yet committed or staged those changes. Ultimately, you would like these changes to be committed and merged into the main branch. Give a sequence of commands that will achieve this.