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.