egit

Using eclipse egit plugin I've encountered "multiple merge bases" exception. Before I've managed to resolve the situation, but this time nothing helps. Even after creating additional commits and branches, cherry pick. Repository branches seems blocked to merge. This is the exception: An internal error occurred during: "Merging with refs/remotes/origin/master". Exception caught during execution of merge command. java.io.IOException: Multiple merge bases for: 082a3a9846147a0e6df72d6cffa6d6e517275b7b 4d6c573c52ebb0de091bd91dbcefcbcbd44e7534 found: c480f2b3683a5d0c5607984ea6393d61dfa9fba4

We have just set up GitLab 5.0 using Bitnami stack and need quick start. By Bitnami default SSH is disabled. That is OK with me, I'd prefer use HTTP. But it seems that GitLab 5.0 doesn't smoothly support HTTP. For example on project page http://192.168.133.99/gitlab/publicproject1 , when switching to HTTP option, help below is not updated. I have one project publicproject1 checked as public. But I can't clone it in any way (using git or EGit): weibl@FX-JSJ532 ~/pp1 $ git clone http://192.168.133.99/gitlab/publicproject1.git Cloning into 'publicproject1'... fatal: http://192.168.133.99/gitlab

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? VonC 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

After copying my GIT repo from a PC computer onto my MAC, i can't seem to import it to an eclipse. Import happens via eGit plugin directly from existing local git repository. Same exact import works perfectly fine on existing Windows computer. Please advise. org.eclipse.core.internal.resources.ResourceException: Invalid project description. at org.eclipse.core.internal.resources.Project.checkDescription(Project.java:162) at org.eclipse.core.internal.resources.Project.assertCreateRequirements(Project.java:52) at org.eclipse.core.internal.resources.Project.create(Project.java:274) at org.eclipse

I'm working onn a project in Eclipse hosted on Github. Everytime I want to push, a dialog pops up asking for username and password. Anybody know how to save these so I don't have to keep typing them in everytime? I'm using Egit in Eclipse 4.2.1 Sean Snyder Struggled with this for a while too: Go to the Git Perspective -> Expand your Project -> Expand Remotes -> Expand the remote you want to save your password. Right-click on the Fetch or Push -> Select Change Credentials... Enter username and password -> Select Ok This is the workaround I've found to work. It's a bit manual for each Git

I'am using EGit and I commited a change to my local git repository. I'd like to push this change to a remote. When doing that, a dialog screen pops up which shows "rejected-master-master-non-fast-forward" . The answer of this linked question states that I have to pull first. When doing the pull, an EGit exception is thrown: org.eclipse.jgit.api.errors.TransportException: Nothing to fetch. at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:139) at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:253) at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:97) at org

I am successfully pushing my project to GitHub using EGit. My repository is called HelloWorld. My project in eclipse is also called HelloWorld. My problem is when i push the project it is upload the project under the folder HelloWorld. So the result is the repository HelloWorld then the folder HelloWorld and the the src folder. To be more understandable here is the link of the project. I want under the repository HelloWorld to have the src folder. How can I achieve that? The key lies in when you create the project in eclipse. First step, you create the Java project in eclipse. Right click on