In this video I'm going over the complicated process of dealing with merge conflicts.
Merge conflicts are not a one size fits all so this video will demonstrate some of the more simple conflicts to resolve.
Dealing with merge conflicts is one of the more challenging aspects of software development.