Added helpers for --ours and --theirs options for git checkout