Please Commit your changes or stash them before you can merge in Git

Question

Hi Guys,

I made some updates on my local machine and pushed them to a remote repository, and now I'm trying to pull the changes to the server. But I am getting the below error.

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

Answer 1

Hi@akhtar,

You can't merge with local modifications. Git protects you from losing potentially important changes.

You have two options.

• Commit the change using the below command.

$ git commit -m "My message"

• Stash it. Stashing acts as a stack, where you can push changes, and you pop them in reverse order. To stash, type the below code.

$ git stash

• Now do the merge, and then pull the stash.

$ git stash pop