Team Collaboration with Git

Housekeeping

• Schedule updates
• SSH keys:
  • Everyone needs to be set up by the end of class
• CPNT 201 Assignment 2 Announced
  • Tony will assign partners this afternoon

---

1. Schedule discussion

Tony has a new schedule in a branch and will merge it into main.

2. Static website templates

Materials

• Publish a static html template
  • These lab instructions create a repo locally and then pushes to GitHub
• Publish a webpage with Git and GitHub Pages
  • These lab instructions create a repo remotely and clones to your machine.

3. Pair coding: Commit catch

Materials

• Video: Pair programming process with Fiona and Semira
• Lab: Commit Catch
• Potential pair coding activities
  • Publish a static html template
  • Collaborate on a journal entry
  • Write a poem?

4. Resolving Conflicts

Materials

• Lab: Create a merge conflict on purpose (by yourself)

---

Lab Time

• Partners assigned for Assignment 2
• Set up your SSH keys
  • Ask for help with your Assignment 2 partner
• Assignment 1
• Assignment 2