Merge conflict

A merge conflict is what happens when two members of a team have edited the same file and GIT doesn’t know how to put the changes together.

Git flags a “merge conflict” in this case and there is a workflow that one has to go through to resolve the merge conflict.

Basically this involves editing the area to decide which changes should be retained, then adding and committing the files.

I haven’t fully fleshed this process out here - happy to do so when we hit the first merge conflict with a team.