Merge Conflict Description

To explain a merge conflict, it might be useful to have an example. Imagine we are creating a template for people to describe themselves. You might have something that looks like this:

Name: First Last
Location: I Live Here
Favorite Sports Team: Golden State Warriors

Now, let’s imagine that Matt and Briana decide to change the default Favorite Sports Team in the template. So they might have something that looks like this:

Matt

Favorite Sports Team: San Francisco Giants

Briana

Favorite Sports Team: San Francisco 49ers

When Matt merges his changes into the deployment branch, he won’t encounter a merge conflict.

However, when Briana tries to merge her changes into the deployment branch, she is going to encounter a merge conflict.