Home
Challenges
Coding Challenges
Coding In The Cabana
Beginners
p5.js
Processing
Git and GitHub
Learning
Nature of Code
ml5.js Beginners Guide
Discord Bot
Advanced p5.js
Guest Tutorials
Data and APIs
Programming with Text
Noise
More
Mouse Learning Talk
Frequently Asked Questions
Teachable Machine
Workflow
Archive
Contribute
Community Contribution Guide
Github
All Guides
Resolving Merge Conflicts
Git and GitHub for Poets Lesson #9
❰
Watch all videos
❱
In this video, I look at how to resolve a “merge conflict” using the GitHub interface.
Links discussed in this lesson
Pull Request to Neural Network Library