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
In my version “Replace With…” -> “HEAD Revision” seems to be doing just that… It’s not in the “Team” submenu, which is a bit confusing, I admit.. Also, this might help : Eclipse git checkout (aka, revert)
By default, EGit automatically adds resources marked as “Derived” to .gitignore. A typical example is the bin folder in a Java project containing the compiled classes. You can disable this by going to Window > Preferences > Team > Git > Projects and deselect “Automatically ignore derived resources by adding them to .gitignore”. There was … Read more
Update 2022: In what follows, always use: a App password, not your account password (see blog post). So create your app password. a BitBucket Cloud, since BitBucket server will be discontinued in Feb. 2024. A. To specify credentials individually for each remote Open Git repositories view, open “Remotes > origin > <your push url>“ click … 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
After all I found it, hidden in the “Git Repository view”:
As mentioned in this EGit tutorial, the destination directory you mention when importing (cloning) a Git repo is any directory you want, in which the .git will be created: You don’t have to select the workspace itself (at least, you should select the workspace/myproject subdirectory, in order to not make the all Eclipse workspace a … Read more
Eclipse Preferences / Team / Git / Configuration / User Settings (“core” section) key: autocrlf value: false The key should already exist, so just need to edit the value. If creating a new key then use core.autocrlf.
Are you using the Team Synchronise view? If so that’s the problem. Conflict resolution in the Team Synchronise view doesn’t work with EGit. Instead you need to use the Git Repository view. Open the Git perspective. In the Git Repository view, go to on Branches → Local → master and right click → Merge… It … Read more
Might also be bad SSL cert, fix the server If you have a GIT server with an outdated or self-signed SSL cert fix the server, afterwards everything should run fine. Insecure Hotfix: Let the client accept any certificate The following solution is just a mere hotfix on client side and should be avoided as it … Read more