home ¦ Archives ¦ Atom ¦ RSS

Git Conflict Resolution Tutorial

Link parkin’: Git & GitHub Foundations • Conflict Resolution Editor [embed]http://www.youtube.com/watch?feature=plcp&v=xfh13LcgqIU[/embed]

This is one aspect of git that I don’t have a good handle on. Hoping this YouTube tutorial from GitHub can clarify things. Also looks like there a few other YouTube tutorials on the topic.

© 2008-2024 C. Ross Jam. Built using Pelican. Theme based upon Giulio Fidente’s original svbhack, and slightly modified by crossjam.