Resolve a conflict

What loot refuses to guess, and how to answer it.

This page has not been written yet. In the meantime, see Keep a file private in a shared repo.