I made some changes in my local git branches and then pushed them to Github. Now I am trying to pull the changes to the server but it shows an error message:
error: Your local changes to the following files would be overwritten by merge: Please, commit your changes or stash them before you can merge.
How can I solve this error? Any ideas?