git pull: keeps telling me to stash local changes before pulling

Question

When I am trying to pull my git repository with \"git pull\", it keeps telling me that I have local changes although I have not touched any of the mentioned files. Can someone e

Answer 1

Git simply can't pull the changes if the files you have edited locally were changed on the remote. Basically, you have two choices:

• stage and commit your changes, then Git will try to merge it during the pull (or ask for your help);
• stash the changes, which puts them aside so you could pull the remote code and then re-apply your modifications.

Answer 2

It sounds like your local branch does not have all of the changes on origin.

Firstly, stash your changes

git stash

Then, pull in the changes from origin.

git fetch origin && git rebase origin/(branch name)

Next, add the stash back in to your working directory:

git stash pop