Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'

* jc/maint-checkout-fix: checkout --ours/--theirs: allow checking out one side of a conflicting merge checkout -f: allow ignoring unmerged paths when checking out of the index checkout: do not check out unmerged higher stages randomly