When we're merging branches or pushing code, git does a good job of handling updates automatically. Every once in a while, though, you may run into an issue where git doesn't know what to do. It doesn't know the best way to merge your files. This is called a merge conflict. If you've never seen this before, it can be a little scary. But *fear not*, today, we'll talk through how to resolve a merge conflict.
👉🏻 RELATED VIDEOS
Part 1: What is git? Why use it? How to install it
Part 2: How to use git in the Terminal and in a Graphical User Interface, like Tower
Part 3: Fixing Bad Commits
Part 4: Branching
Part 5: Working with git in a Team - Coming Soon!