How do I resolve git saying Commit your changes or stash them before you can merge

Question

I made some changes to my local machine and pushed it to the remote repository. I am getting this message while trying to pull the changes to the server.

error: Your local changes to the following files would be overwritten by merge:
wp-content/w3tc-config/master.php
Please, commit your changes or stash them before you can merge.

I tried solving it by running:

git checkout -- wp-content/w3tc-config/master.php

But I still get this message. I just want to merge the rest of my changes (plugin updates). I'm assuming that w3tc changed something in the config file on the server. Can someone help me with this?

Answer 1

To solve this issue you have 3 different ways and they are:

Commit the change.

git commit -m "My message"

Stash it.

You can push changes and stack them up in reverse order.

To stash, type:

git stash

Do the merge, and then pull the stash:

git stash pop

Discard the local changes

using git reset --hard.

or git checkout -t -f remote/branch.

Discard local changes for a specific file

using git checkout filename.

I hope this helps.

Answer 2

To solve this issue you have 3 different ways and they are:

Commit the change.

git commit -m "My message"

Stash it.

You can push changes and stack them up in reverse order.

To stash, type:

git stash

Do the merge, and then pull the stash:

git stash pop

Discard the local changes

using git reset --hard or git checkout -t -f remote/branch.

Discard local changes for a specific file

using git checkout filename.

I hope this helps.