Git pull aborts itself, local file changes will be overwritten by merge

git git-pull merge-conflict-resolution
Sasha_8 picture Sasha_8 · Aug 28, 2013 · Viewed 38.4k times · Source

I have changed a file that my friend is working at the same time. I did some changes and now I want to push it but it says I should pull first. When I git pull, it says:

error: Your local changes to the following files would be overwritten by merge: Please, commit your changes or stash them before you can merge.
Aborting

How can I merge the file? If I do it would the file from my friend completely change? I am sure he has added some stuff and I have added my stuff. How will our changes be handled?

Answer

nyzm picture nyzm · Aug 28, 2013

One approach is to commit that file first then pull.

git add filename
git commit 
//enter your commit message and save 
git pull

Another approach is stash your changes then pull. Then apply stash.

git stash
git pull
git stash apply stash@{0}

Related questions

Why does git say "Pull is not possible because you have unmerged files"?

When I try to pull in my project directory in the terminal, I see the following error: harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master U app/config/app.php U app/config/database.php U app/routes.php Pull …

Read More
why git stash cannot abandon the changes made just now?

i forked a project from github, and the origin point to my own github repo, remote point to its original repo, since i want to get update from remote, i use git pull remote branch_name, then my local repo …

Read More
How do I force "git pull" to overwrite local files?

How do I force an overwrite of local files on a git pull? The scenario is the following: A team member is modifying the templates for a website we are working on They are adding some images to the images …

Read More