How do you git fetch then merge? "Error: Your local changes to the following files would be overwritten by merge"

git git-merge git-fetch
ario picture ario · Mar 6, 2012 · Viewed 29.3k times · Source

Newbie Git question: I have a repo set up on bitbucket. I git fetched someone else's changes and would like to merge them with my own. However, when I try to git merge (or git merge origin/master), I get the message "error: Your local changes to the following files would be overwritten by merge:", and then a list of files I've changed. Having Git merge these changes is exactly what I want to do though.

Answer

ralphtheninja picture ralphtheninja · Mar 6, 2012

You can either commit your changes before you do the merge, or you stash them:

git stash
git merge origin/master
git stash pop

Related questions

The following untracked working tree files would be overwritten by merge, but I don't care

On my branch I had some files in .gitignore On a different branch those files are not. I want to merge the different branch into mine, and I don't care if those files are no longer ignored or not. Unfortunately …

Read More
Git: How to pull a single file from a server repository in Git?

I am working on a site with a server running Git. I am using Git for deployment (not GitHub). This was set up prior to my involvement using a hook method, and I referred to this question and entered the …

Read More
Is it possible to pull just one file in Git?

I am working on a Git branch that has some broken tests, and I would like to pull (merge changes, not just overwrite) these tests from another branch where they are already fixed. I know I can do git pull …

Read More