Chapter about conflicts

[SirNickolas]

Could you please write a chapter about resolving merge conflicts? I think, it’s the last critical piece left.

By the way, you also said you were going to write about tags and releases, but it’s far less important, in my opinion.