Git and GitHub for Poets - 1.9: Resolving Merge Conflicts - Git and GitHub for Poets

5.0 (0)

18 learners

What you'll learn

This course includes

2.3 hours of video
Certificate of completion
Access on mobile and TV

Summary

Keywords

github git tutorial github (website) github pages github tutorial github pages tutorial website version control repository daniel shiffman how to use github

Full Transcript

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

Continue this lesson in the app

Install CourseHive on Android or iOS to keep learning while you move.

Related Courses

Curso de Git e GitHub: grátis, prático e sem usar comandos no terminal

⭐ 5.0

5 ratings

8.5 hours

se un desarrollador frontend completo

Domina Git, GitHub, HTML, CSS y JavaScript desde cero: tu puerta a la programación web con nuestras guías claras y prácticas paso a paso. ¡Transforma tus habilidades hoy!

⭐ 5.0

5 ratings

8.3 hours