Overview of the activity

This activity will proceed as follows:

1. Create three branches, adding commits to each one, to set up three different merging scenarios.
2. Merge one branch into main to demonstrate a fast-forward merge.
3. Merge a second branch into main to demonstrate a true merge with successful auto-merging.
4. Merge the third branch into main to demonstrate a true merge with merge conflicts.
5. Resolve the merge conflicts and complete the final merge.

---

⏴ Back

Next ⏵