git: merge conflicts

Not nearly as scary as you may have been told

This page is a placeholder for some guidelines for dealing with merge conflicts.