In this video, I look at how to resolve a “merge conflict” using the GitHub interface.
🎥 CircleCI: Unit Testing and Continuous Integration:
🚂 The Coding Train website:
💖 Support this channel on Patreon:
To buy Coding Train merchandise:
📚 Book recommendations:
🎥 My Git and GitHub playlist:
🎥 For an Introduction to Programming: