Git. Rebase local branch atop local master. How do I ignore a single files changes?

Question

With Git I am on a branch. I am rebasing the branch atop master. There is a conflict that I want to resolve by ignoring the branches version and accepting master's version. How do I indicate I want to use master's version of the file during the rebase-ing.

Thanks,
Doug

Answer 1

git checkout --ours <path-to-file> is the command you are looking for.

It will checkout the master version of the file which you then can add to the index (to mark the conflict resolved) and continue your rebase.

You can take a look at the checkout documentation for more information.

See the comment under --merge as to why you need to use --ours and not --theirs.