CP367: Lab 11 - Winter 2026 - Git

Due 11:59 PM, Friday, April 3, 2026

Branching

Read the 12 pages from the section BRANCHING in the chapter GIT AND GITHUB from the textbook UNIX WORKBENCH. Posted on MLS.

Partners

Please find a Partner (at least one of you must have git access). If you have trouble finding a partner or have trouble accessing GIT please send me an email.

Complete the following 4 exercises from the textbook (retyped here for your convenience):

  1. Initialize a repository in git, add a file, and commit it on the master branch.
  2. Start a new branch.
  3. Switch to that branch and add commits to it. Switch to an older branch and then merge the new branch into your current branch.
  4. Purposefully create and resolve a merge conflict.

Submission Requirements

Pipe the output after the merge conflict, and after the resolution into a text file. Please make sure that the textfile is formatted as follows:

CONFLICT:
[conflict output]
RESOLUTION:
[resolution output]
TREE: 
[git log --graph]