Merge branch 'se/doc-checkout-ours-theirs' into maint