For the love of Git

Stupid GitHub "conflicts" with no explanations.