How to use Git - Git Video Tutorial - Part 4 (Merge Conflicts)
Part 4!
Having merge conflicts can be one of the scariest things in git especially if you're new. The wrong combination/work flow could erase someone's code and potentially result in tar and or feathering. (I suggest you quit your company if this could potentially happen)
These two videos detail two different ways of dealing with merge conflicts (The two parts are shown in part 5)
As always if you all have any questions or comments feel free to ask.
Colors:
git config color.ui true