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 Animal: Octocat
Now, let’s imagine that Linda and Louise Belcher decide to change the default
Favorite Animal in the template. So they might have something that looks like this:
Favorite Animal: Kuchi Kopi
Favorite Animal: Akkorokamui
When Louise merges her changes into the deployment branch, she won’t encounter a merge conflict.
However, when Linda tries to merge her changes into the deployment branch, she is going to encounter a merge conflict.