1.9: Resolving Merge Conflicts - Git and GitHub for Poets

Channel:
United States The Coding Train
Subscribers:
1,750,000
Published on ● Video Link: https://www.youtube.com/watch?v=JtIX3HJKwfo


Category:
Tutorial
Duration: 8:49
325,978 views
5,236

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

๐Ÿ”— Toy-Neural-Network-JS: https://github.com/CodingTrain/Toy-Neural-Network-JS

๐ŸŽฅ CircleCI: Unit Testing and Continuous Integration: https://www.youtube.com/playlist?list=PLRqwX-V7Uu6bLqwFa52YGEHy-L1-D_Ve-

๐Ÿš‚ The Coding Train website: http://thecodingtrain.com/
๐Ÿ’– Support this channel on Patreon: https://patreon.com/codingtrain
๐Ÿ›’ To buy Coding Train merchandise: https://www.designbyhumans.com/shop/codingtrain/
๐Ÿ“š Book recommendations: https://www.amazon.com/shop/thecodingtrain

๐Ÿ’ป https://github.com/CodingTrain/Rainbow-Code

๐ŸŽฅ My Git and GitHub playlist: https://www.youtube.com/playlist?list=PLRqwX-V7Uu6ZF9C0YMKuns9sLDzK6zoiV
๐ŸŽฅ For an Introduction to Programming: https://www.youtube.com/playlist?list=PLRqwX-V7Uu6Zy51Q-x9tMWIv9cueOFTFA


๐Ÿ”— https://p5js.org/
๐Ÿ”— https://processing.org

๐Ÿ“„ Code of Conduct: https://github.com/CodingTrain/Code-of-Conduct



Other Videos By The Coding Train


2018-02-27Coding Challenge #94: 2048 - Part 2
2018-02-26Coding Challenge #94: 2048 - Part 1
2018-02-2416.10: Particle System with JS Array Functions - Topics of JavaScript/ES6
2018-02-2316.9: Array Functions: sort() - Topics of JavaScript/ES6
2018-02-2216.8: Array Functions: filter() - Topics of JavaScript/ES6
2018-02-2116.7: Array Functions: reduce() - Topics of JavaScript/ES6
2018-02-2016.6: Array Functions: map() and fill() - Topics of JavaScript/ES6
2018-02-1916.5: Higher Order Functions in JavaScript - Topics of JavaScript/ES6
2018-02-18Coding Train Live 122: filter(), sort() and 2048
2018-02-17Coding Train Live 121: map() and reduce() in JavaScript
2018-02-151.9: Resolving Merge Conflicts - Git and GitHub for Poets
2018-02-14CircleCI Part 4: Matrix Library Testing and Continuous Integration
2018-02-13Coding Challenge #93: Double Pendulum
2018-02-12Coding Challenge #92: XOR Problem
2018-02-10Live Stream #120: MNIST and Pendulums
2018-02-10CircleCI Part 3: Continuous Integration with GitHub
2018-02-09CircleCI Part 2: Unit Testing with Jest
2018-02-08CircleCI Part 1: Introduction to Unit Testing and Continuous Integration
2018-02-07Live Stream #119 - Solving Merge Conflicts and XOR Problem
2018-02-0710.18: Neural Networks: Backpropagation Part 5 - The Nature of Code
2018-02-0610.17: Neural Networks: Backpropagation Part 4 - The Nature of Code


Tags:
github
git
tutorial
github (website)
github pages
github tutorial
github pages tutorial
website
version control
repository
daniel shiffman
how to use github
version control tutorial
repository tutorial
how to get started with github
github version control
web hosting
how to github pages
merge
merge conflicts