Resolving Merge Conflicts / The Coding Train

- Toy-Neural-Network-JSGitHub repo for Neural Network JavaScript library for Coding Train tutorials
  📒💾
In this video, I look at how to resolve a “merge conflict” using the GitHub interface.
- GitHub
  GitHub homepage
- 📚
  GitHub Docs
  Quickstart tutorial for how to get started with Git and GitHub.
- CircleCI: Unit Testing and Continuous Integration
  Unit testing and continuous integration in JavaScript with Jest, CircleCI, GitHub.
- Editing
  by Mathieu Blanchette
- Animations
  by Jason Heglund

In this video, I look at how to resolve a “merge conflict” using the GitHub interface.

CircleCI: Unit Testing and Continuous Integration
Unit testing and continuous integration in JavaScript with Jest, CircleCI, GitHub.

Resolving Merge Conflicts