Git拉失败，现在有数十个未跟踪的文件

Question

Occasionally when a pull fails and I end up with dozens of untracked files. These files appear to be all the files changed after the last pull. eg:

$:/var/django/freshplum$ sudo git pull
Updating acb962a..eaf8c43
error: Your local changes to 'plum/api/resources/product.py' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.


$:/var/django/freshplum$ git status
# On branch master
# Your branch is behind 'origin/master' by 140 commits, and can be fast-forwarded.
#
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   deleted:    plum/api/resources/feed.py
... dozens of files ...
#   modified:   plum/www/views.py
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#   plum/bacon/tests/models/segment.py
... dozens of files ...
#   plum/www/templates/www/internship.html
no changes added to commit (use "git add" and/or "git commit -a")

I can solve this problem with:

git reset --hard HEAD
git clean -f -d
git pull

What's the best way to resolve this situation?

Answer 1

Try this in order first:

git add --all (or specific files)
git commit -a (or specific)
git pull
git push origin master (or your branch)

Then if you don't have request try the same lines you post (git clean or reset).

Finally if you have conflicts remove them.

Answer 2

Another way to do it, though not neccessarily better: Do what git tells you to do.

Stashing takes the dirty state of your working directory — that is, your modified tracked files and staged changes — and saves it on a stack of unfinished changes that you can reapply at any time.
- Git - Stashing

git pull failed, you have many untracked files that were 'pulled' but then the pull was aborted and the files stayed. Now:

git add -A        # stage all files so they are now stashable
git stash         # stash them - the working dir is now clean
git pull          # pull
git stash drop    # forget the stashed changes. Alternatively: git stash pop

Note that this will also get rid of any untracked files you had before pulling.

---

There's a second way that git is reommending you:

Please, commit your changes

git add -A
git commit -m "new commit"
git pull

This makes sense if you want to keep your local changes and get the new commits from the remote. You might then encounter merge conflicts which you can resolve.

Answer 3

Well, for starters, you should probably pull more often so you don't have 140 commits to merge.

Second, you should either stash or commit your local changes before you try to pull, just as the message says.