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

[@SportsIncorporated]

Much thanks Jason. Please use larger type next time.

[@Espersontheone]

Yes we watched 3.5 ^^

[@thejacenxpress]

@prajsd Hey there, so if it can't find the config file that most likely means you're not in the correct directory. You need to run that command inside of your project folder. If that still does not work send me a private message and we'll figure it out.

[@B4nks]

YOU need a PUNCH LINE .. YOU NEED TO KEEP SAYING IT!!!! haha