Lab 04: Git and Debugging

Lab Goals

• To fix a self-inflicted merge conflict
• To practice a bit of debugging

Differences from the Java version

• The Git portion is more self-contained, and doesn’t affect any actual code.

---

Table of contents

• Instructions
• Summary and Deliverables