Questions about Syncing

I think that this is still the most relevant answer to how conflicts are handled.