Git for Beginners: How to Resolve Merge Conflicts (Part 5)
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.
👉🏻 LINKS
Hyper - Free Terminal: http://hyper.is
Hyper Cobalt 2 Theme - https://github.com/wesbos/hyperterm-c...
Kaleidoscope - https://www.kaleidoscopeapp.com/
Tower - https://www.git-tower.com/mac
Project Code on GitHub - https://github.com/selfteachme/0009-m...
👉🏻 RELATED VIDEOS
Part 1: What is git? Why use it? How to install it - https://www.youtube.com/watch?v=A6bo-...
Part 2: How to use git in the Terminal and in a Graphical User Interface, like Tower - https://www.youtube.com/watch?v=cX-2k...
Part 3: Fixing Bad Commits - https://www.youtube.com/watch?v=d--34...
Part 4: Branching - • Git for Beginners: Branching (Part 4)
Part 5: Working with git in a Team - Coming Soon!
👉🏻 Get Updates and Exclusive content at: http://selfteach.me
💥 SelfTeach.me is a Zeal show: http://codingzeal.com
