Question 3: Version control [9]

Suppose you were maintaining two branches of this semester's CSCI 265 project: a gtk branch (like phase 3 but fully functional) and a console-mode branch (like phase 2).

Part 1. Which (if either) would you make the master branch and why?

Part 2. If the instructor released a change to a file that is included in both branches, detail the steps and git instructions you would need to follow to do so.