Overview of the activity
This activity will proceed as follows:
- Create three branches, adding commits to each one, to set up three different merging scenarios.
- Merge one branch into
main to demonstrate a fast-forward merge.
- Merge a second branch into
main to demonstrate a true merge with successful auto-merging.
- Merge the third branch into
main to demonstrate a true merge with merge conflicts.
- Resolve the merge conflicts and complete the final merge.