Resolving Merge Conflicts
Back 9 / 11
In this video, I look at how to resolve a “merge conflict” using the GitHub interface.
GitHub homepage
Quickstart tutorial for how to get started with Git and GitHub.
Unit testing and continuous integration in JavaScript with Jest, CircleCI, GitHub.