So you’re happily committing your code in git, maybe even using branches to organize and keep track of code, when all of a sudden you encounter a merge conflict - don’t panic!
There are two primary ways that merge conflicts happen:
You are trying to merge two branches that each made a change to the same line of some file
You are trying to merge two branches that have a different history.
The second version really only happens when you start using a “remote” like github, so we’ll deal with that in a future video. For now, let’s take a look at the first example, and how to solve it.
