Situation: You have local uncommitted changes You pull from the master repo You get the error “Checkout conflict with files: xy” Solution: Stage and commit (at least) the files xy Pull again If automerge is possible, everything is ok. If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>) Manually edit … Read more
The key lies in when you create the project in eclipse. First step, you create the Java project in eclipse. Right click on the project and choose Team > Share>Git. N.B: Eclipse will give you a warning about putting git repositories in your workspace. So when you create your project, set your project directory outside … Read more
Make sure your refs for pushing are correct. This tutorial is pretty great, right from the documentation: http://wiki.eclipse.org/EGit/User_Guide#GitHub_Tutorial You can clone directly from GitHub, you choose where you clone that repository. And when you import that repository to Eclipse, you choose what refspec to push into upstream. Click on the Git Repository workspace view, and … Read more
Finally I made it work thanks to the steps outlined in the Eclipse forum: Set up the SSH key stuff Download and install mysys git according to the github instructions at http://help.github.com/win-git-installation/ In C:/Users/you/ssh hide any existing keys (id_rsa and id_rsa.pub) in a subdirectory. If the ssh directory does not exist, create it. Of course, “you” is … Read more