Undo single-file local uncommitted change in egit (e.g. svn revert) [duplicate]

See this answer: https://stackoverflow.com/a/4104149/152061 (send upvotes there) Right click on the file -> Replace With -> Index (old versions might say File in Git Index rather than Index) or if you want to undo all files that have changed, right click on the project -> Team -> Reset.. -> select the ‘hard’ radio button -> … Read more

Egit rejected non-fast-forward

I had this same problem and I was able to fix it. afk5min was right, the problem is the branch that you pulled code from has since changed on the remote repository. Per the standard git practices(http://git-scm.com/book/en/Git-Basics-Working-with-Remotes), you need to (now) merge those changes at the remote repository into your local changes before you can … Read more

“Auth Failed” error with EGit and GitHub

My answer may be outdated but hopefully it can be useful for someone. In your Eclipse go to Window > Preferences > General > Network Connections > SSH2 (or just type “SSH2” in preferences window filter box). In “Key Management” tab press “Generate RSA Key…” button. Optionally you can add comment (usually e-mail address) and … Read more

git stash and git pull

When you have changes on your working copy, from command line do: git stash This will stash your changes and clear your status report git pull This will pull changes from upstream branch. Make sure it says fast-forward in the report. If it doesn’t, you are probably doing an unintended merge git stash pop This … Read more

The current branch is not configured for pull No value for key branch.master.merge found in configuration

Your local master branch is not set up to track remote master branch. You could do git pull origin master to tell git the explicit branch you want to pull or you add this to your .git/config: [branch “master”] remote = origin merge = refs/heads/master When you push to master for the first time, add … Read more