How to fix the pushing rejected and asked to pull when pulling results in “everything is up to date”?

问题

Using EGit with Eclipse when I try to push my code into the remote repository I get an error message saying that I should pull first, as shown in Figure 1.

When I then try to pull from the remote repository I get a message saying that everything is up to date, as shown in Figure 2.

How do I fix this problem?

回答1:

Make sure that:

• you are using the latest version of EGit (2.3+)
• you have stashed/commit everything before pulling (as in this thread)
• you are not in a detached head mode (as in "can't push upstream using EGit")

---

The OP Krige adds:

in the end I noticed a class file was mentioned in the DIRTY_WORKTREE error message.
I deleted that file from the file system, did a pull, resolved the conflicts and pushed.
Everything seems to work fine now.

回答2:

If you have the DIRTY_WORKTREE issue and you are not able to delete the file (for whatever reasons), you should do a pull, or replace with HEAD and then add to Index. This will resolve the conflicts (assuming use of the merge tool) and you should then be able to commit/push your changes, or else pull again.

来源：https://stackoverflow.com/questions/15475258/how-to-fix-the-pushing-rejected-and-asked-to-pull-when-pulling-results-in-every