You might have heard the term merge conflict in frustrated grumblings from another Git user. Maybe you encountered one yourself and had to Google your way out. Perhaps you are just exploring Git and GitHub and have no idea what a merge conflict is. This course will walk you through the foundations of managing merge conflicts.
In case you haven't heard, GitHub released GitHub Learning Lab: a new tool to help youlearn GitHub...using GitHub! Go through guided courses on various topics and improve your skills at your own pace.