Update March 2014: As mentioned by cheshire’s answer, EGit 3.3 added that prune feature. You can see said feature introduced in this Gerrit code review in JGit (and tested here) The entry fetch.prune mentioned in git config can be added to your Egit configuration: Original answer (March 2013) EGit perform this pruning when remote tracking … Read more
I just got the same annoying problem. What I did was copying the entire code into notepad. Then from notepad, paste it back into the xml field. I know, it sounds stupid, but it worked and I have no idea why -__-“
In the Git Repositories view: Right-click the repository and choose Fetch from Upstream If the new branch will not shown up below Branches/Remote Tracking, you have to configure fetch: Right-click the fetch node below Remotes/origin and choose Configure Fetch… In the Configure Fetch make sure there is only the single Ref mapping (assuming the remote … Read more
It is possible by first cloning the repository and then creating a General project based on that. Then you can convert it to Java project. Here is how: First go to File>Import…>Projects from GIT. In the Select a Git Repository view you first press Clone. And follow instructions. This will create a local “checkout” of … Read more
It depends on how closely-related these projects are. Ask yourself the following questions: Will they always need to be branched/tagged together? Will you want to commit over all projects, or does a commit mostly only touch one project? Does the build system operate on all of them or do they have a boundary there? If … Read more
I had this same problem after updating egit. This advice from another forum worked: Open up Preferences > General > Security > Secure Storage. Select “OSX Keystore Integration”, then click “Change Password…” If you see a dialog saying “An error occurred while decrypting stored values… Do you want to cancel password change?” Click “No.” This … Read more
The implications of both solutions are listed directly in the user guide that you linked. I can tell you that the part This can result in performance issues is unfortunately very true. So if you have a git directory with a huge number of files inside your workspace, many git operations will start with a … Read more
Says here that you can see the diffs between the working tree and any given reference. Perhaps you should try out the latest version (Juno) of Eclipse/EGit and see if it’s gotten any better? Update: I’ve tried this out in the latest Eclipse, and as far as I can see it works fine. Here’s how: … Read more
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)