Couldn't merge origin/master: error: Your local changes to the following files would be overwritten by merge

Question

I make some changes and commits to my project locally but didn't push them, then I change files in GitHub by adding new file and commit.

when I try to push my local commits android studio suggested to merge but when I try to merge it give me that error and whatever I do keep refusing to merge and show me that message.

and when I click merge shows me.

Error message:

My log:

What should I do?

Answer 1

Your local changes will need to be stashed away while you perform the merge. To do that, git provides git stash to save your uncommitted changes to a temporary location, and git stash pop to apply them back to your local code.

This should work:

git stash
git pull origin master
git stash pop

Here's a good website to learn more about git: http://gitready.com/beginner/2009/03/13/smartly-save-stashes.html

But after looking at your screenshot, a merge doesn't seem like the best option for you. Instead a rebase would make more sense.

git stash
git pull --rebase origin master
git stash pop

Here are some resources to understand the difference between a merge and a rebase:

• http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html
• https://stackoverflow.com/a/3357174/2651774