Exercise: Git Merge Conflict Resolution

Steps

Fork and Clone this repository: MergeConflictExercise

1. Git checkout newBranch: to see the differences between newBranch and main branch.
2. Switch back to the main branch
3. Merge the newBranch branch into main branch and fix the merge conflict

---

Windows Exercise Walkthrough Documentation

Mac Exercise Walkthrough Documentation