Block 1, Task 3: Merge Conflict Drill

[mbannert]

Though good co-ordination avoids merge conflicts most of the time in practice it is important to know how to fix them when they occur. Most of the time common sense, like not editing the same files at the same time, is enough to avoid conflicts on smaller teams. Yet despite their relatively rare nature, in this task, let's create a merge conflict.

• let one member of your group create a new repository on their GitHub account.

• use the repository settings and your teammates' GitHub account names to add collaborators.

• clone the repository and get to work ...

• create a file named task-3-name-of-your-group.md

• add your name to that file: add, commit, pull, push. Depending on who was the first in your group to push. You will get a merge conflict. Which version is the right one? Are all versions to be kept? Work together to remove the conflict and push the result.

The goal in the end is to have an .md file for your group in which all members entered their names on their own that looks like this:

• Donald Duck
• Bugs Bunny
• Superman
• Batman
• Globi