Merging but overwriting changes in Git

git conflict
John Hunt picture John Hunt · Jan 11, 2013 · Viewed 43.5k times · Source

When I merge a branch in Git to master I often get merge conflicts. Is there a way to merge a branch and just overwrite the stuff in the current branch?

Answer

kmkaplan picture kmkaplan · Jan 11, 2013

Add -X ours argument to your git merge command.

Say you are working in your local branch. Then you want to merge in what went in the master:

git merge -X ours master

On the other hand if you are in master and want to merge your local branch into master then @elhadi rightly says you should use theirs:

git merge -X theirs somebranch

Related questions

Git resolve conflict using --ours/--theirs for all files

Is there a way to resolve conflict for all files using checkout --ours and --theirs? I know that you can do it for individual files but couldn't find a way to do it for all.

Read More
Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

I've started Eclipse EGit. In some scenarios it is really not comprehensive. I have local file e.g. pom.xml changed. On git server this file was changed. I do pull, EGIt says: Checkout conflict with files: i.e. pulling …

Read More
How do I manage conflicts with git submodules?

I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within. For this question, lets say my superproject is called supery and …

Read More