add checkout {--theirs,--ours}.