egit

问题 I get the Git conflict icon in Eclipse on lots of files, even though it seems that I resolved any possible conflicts. In Eclipse 4.5.2, in the Project view, I select a project root and do right-click -> Compare to branch origin/master . Next, we see the Team Synchronization view. Many files show a red conflict icon., but they should not. The Git staging view, which is supposed to show conflicts, is empty. I already tried Merge; Committing the merge (nothing remains to be committed). I tried

问题 I recently created new project (" FirstSimpleWebDataBase ") and committed it to new repo. Today I was working on my old project ( " BeamReinforcement " ) and accidentally pushed whole " firstSimpleWebDataBese " project into it's repository. When I check repo at Github it's shows this: Added by accident project is grey and I would like to delete it. I checked history in EGit but there is not such commit so I can not reverse it from eclipse. How can I fix it ? 回答1: That gray folder is a gitlink

问题 In my git repository I can do git status and it tells me that everything is up to date: [598] : git status # On branch master nothing to commit (working directory clean) If I connect to the repository with EGit and do a synchronize in Eclipse I get: Somehow EGit thinks that a lot of files have been removed and readded witht the same name. Since git status returns nothing to commit I expect to get an empty window here. For completeness: This is on OSX 10.7 but I've seen the same problem on

问题 As per the EGit User Guide, to use the merge tool, one should right-click on the resource with a merge conflict and then select Team > Merge Tool . However, when I do this, the Merge Tool option is greyed out. EGit is properly detecting the conflict and showing me both the icon and text label decorations for the file in conflict. Any ideas? 回答1: It was disabled for me because I had some changes on my stash list. $ git stash clear fixed the problem for me. 回答2: It can depend on the version of

问题 I have a git android project managed in eclipse and some times i want to temporarily roll back my android project to a specific time and then build it and do stuff and then restore to the latest version. How is this possible? 回答1: To check out an old state: Open the History view for the repository (Window > Show view > Other... > Team > History) Select the commit at the time you want Context menu > Checkout When you want to go back, just select the commit where master is (or the branch you

问题 As I understand GIT, when I checkout on commit, I should get its files copy in my work directory, but no new commit should appear. Though when I use EGit and checkout on commit I see new commit in reflog. Why? As I understand checkout should not create new commit. Right? Here I right click on commit and choose checkout Then I get new commit in reflog: So now I have few commits in my local master, but I never asked to do them. Git integration for Eclipse - Task focused interface 4.6.1

问题 I tried to make a really simple "hello world!" import using EGit in Eclipse. I have not found any evidence that the software is not working (no bug found in Google), so it looks I made something wrong which I do not know. I followed the steps defined here: http://craigmart.in/2012/01/17/import-an-existing-git-repo-to-eclipse/ It crashes when connecting to GitHub. Essentially this is what I am getting: I have extracted the following information from the error log: org.eclipse.core.runtime

问题 I tried to make a really simple "hello world!" import using EGit in Eclipse. I have not found any evidence that the software is not working (no bug found in Google), so it looks I made something wrong which I do not know. I followed the steps defined here: http://craigmart.in/2012/01/17/import-an-existing-git-repo-to-eclipse/ It crashes when connecting to GitHub. Essentially this is what I am getting: I have extracted the following information from the error log: org.eclipse.core.runtime

问题 I tried to make a really simple "hello world!" import using EGit in Eclipse. I have not found any evidence that the software is not working (no bug found in Google), so it looks I made something wrong which I do not know. I followed the steps defined here: http://craigmart.in/2012/01/17/import-an-existing-git-repo-to-eclipse/ It crashes when connecting to GitHub. Essentially this is what I am getting: I have extracted the following information from the error log: org.eclipse.core.runtime

问题 I use EGit in eclipse to pull and push. my config is: [remote "origin"] fetch = refs/heads/*:refs/remotes/origin/* push = refs/heads/*:refs/remotes/origin/* local branch is master Remote Tracking branch is origin/master when I do push, it comes out "origin/master:master[up to date]". Actually the remote branch is not up to date. I wander if I configure the wrong way. Sometimes I change different configure, I will get either "create a new branch"(which is wrong, as I just push some commits) or