egit

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? It was disabled for me because I had some changes on my stash list. $ git stash clear fixed the problem for me. It can depend on the version of EGit you are using, and on the operation that lead to the conflict. See for instance bug 339092 which mention

I have created a gitlab repository and followed the installation instruction by the letter and it was successful (i think... i can browse the repository online) and now I want to connect the egit plugin from eclipse to this remote repository. I was using SVN for quite some time and now we need to switch to git and I am confused. egit only gives me the option to create a local repository but I'm a bit lost on how to push/fetch code to my online repository. Any advice will be greatly appreciated :) Thanks! VonC With Gitlab (working with ssh urls), that means you have to register your public and

I am new to GIT. I use EGIT with eclipse. I have a question about branches where I see two sections "Local" and "Remote Tracking". If I have to work on one of the branches, I think there are two ways I can accomplish it. a) Check out origin/featureBranch under remote tracking and work on it. b) Right click under local and create a local branch and point to ref/remote/featureBranch and start working on it? Are there any difference between these two approaches? which one is preferred? VonC b) would be best. a) would create a DETACHED HEAD , which would allow you to work on an "anonymous" branch,

I recently started using Eclipse Kepler with EGit plugin and these branches are not what I am used to. Is there a way to permanently stop these branches from being created? I tried removing them manually, but it does not work and I don't want to have them the next time I do fetch or rebase. As I understand from the comments on your question, you only want these refs not to be shown in History view. You may try to uncheck Additional Refs from Preferences > Team > Git > History . This should do the job. ORIG_HEAD and FETCH_HEAD are symbolic refs. They simply record the sha1 of the last Origin

In our new project we've got 10 repositories, each of which have interdependent Eclipse projects. I plan to establish a default workflow, where each developer is working on the master branch and uses the commit-pull-push cycle. To reduce commits and get a nice linear history I prefer rebase as standard strategy for pull. This works fine, if branch.master.rebase=true is set. Unfortunatelly it has to be set manually for all repositories, after they are cloned with EGit. I tried setting branch.autosetuprebase=always , but this affects manually created local branches only, not the master branch

I set up a GIT Server in our internal network. I can push to it using git://...../ and with the option --enable=receive-pack on the server. But when I try to push via ssh using EGIT Eclipse plugin(ssh://username@ip_adress:22/project.git) I get the following error: Transport Error Cannot get remote repository refs. Reason: Exception caught during execution of ls-remote command. What might cause this and how do I solve it? git:// and ssh:// use different protocols (see EGit User_Guide#Git_URLs ). So either use the former in EGit too or make sure ssh access works. roberthernandez This problem's

I use Eclipse Indigo and Windows 7 and plugin egit/jgit for Eclipse. How to change user location in egit? I should do it, because it contains special characters, which doesn't understand egit. I want "C:\git\home\.gitconfig" instead "C:\Users\Кирилл\.gitconfig". How can I do it? When I press "Open" nothing happens. And in the next Tab "Repository setting" I don't change anything too. Gershon Herczeg You need to add an environment variable: This is how i did it on windows 7 Click start button. Right click "Computer" Click "Properties" Click "Advanced System Settings" "Environment variables" in

So I've gotten a project up on github and everything is dandy. Now I want to create a new branch. Here's what I've done: created a new local branch pushed the new branch to github Here's the problem: During the push to my remote, I get this error: Repository ssh://git@github.com/<username>/ProjectColossus.git funny refname error: refusing to create funny ref 'workingBranch' remotely My remote repo is called origin, so I've tried using that refname as suggested in another answer here on stackoverflow, but I get the same error. I've also tried using the same name as my new local branch, in the