Git. Restart the local branch on top of the local master. How to ignore individual file changes?

Question

With Git I'm on a branch. I reload the branch on top of the master. There is a conflict that I want to resolve by ignoring the branch version and accepting the main version. How to indicate that I want to use the main version of the file during reboot.

Thanks,
Doug

Answer 1

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

It will check the main version of the file, which you can then add to the index (to mark a conflict resolved) and continue with your rebase.

You can find more detailed information in the documentation for verification .

See the comment in the --merge section for why you need to use --ours rather than --theirs .

Answer 2

Just in case, when someone cares for me.

If you want to override all your local changes with yours, it's probably because someone deleted the commit that your local branch referenced and added a new one and you do rebase, so git tries (this old commit + yours) on top of mine.

In this case, use git rebase -i remote-branch and comment out the old commit.

Hope this helps.

Answer 3

• If you want to save the current branch file, use git checkout --ours filenamewithpath

• If you want to save the file of another git checkout --theirs filenamewithpath

  Please check this link http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html