Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)

Question

I am in the middle of rebasing after a git pull --rebase. I have a few files that have merge conflicts. How can I accept \"their\" changes or \"my\" changes f

Answer 1

For each conflicted file you get, you can specify

git checkout --ours -- 
# or
git checkout --theirs -- 

From the git checkout docs

git checkout [-f|--ours|--theirs|-m|--conflict=