egit

I have 3 different git repositories: An open source project My own fork of the project on GitHub, which was forked from 1. My local repository, which was cloned from 2. I work on 3., and can push/pull changes to/from 2. However, there are now changes in 1. which I would also like to merge into my own fork. I think what I want to do is pull the changes from 1. into a remote tracking branch in 3., do the merge locally, then push out to 2...... is that sensible? If so, how do I best achieve this in EGit? In particular I'm not sure how I should get Egit to pull in the changes from 1. when it is

I guess this kind of question has been asked many times (and I've seen several questions on SO dealing with this subject) but I still have a problem to ignore a file in my Git. The structure of my project looks like this: myProject/ .gitignore src/test/java/packageName/ Main.java I would like to ignore Main.java (the file is different between each user). .gitignore file .settings .project .classpath target/ test-output/ node_modules/** .orig I've tried: Adding src/test/java/packageName/Main.java to my .gitignore . Creating a .gitignore file in src/test/java/packageName/ that just contains Main

I am using eclipse Juno, and yesterday I noticed my computer was getting very hot. I checked the CPU usage to see it was at 100%. Eclipse was the culprit, busy "re-indexing repository workspace". When after half an hour it hadn't finished and my machine was nearly melting, I searched and found these similar problems: Re-indexing repository loop - not Maven Eclipse hangs on "Re-indexing (fully) repository {username}" Thing is I'm not using git. And by the sounds of things I don't want to since it's going to eat all my CPU. I removed ~/git, deleted a project I have which uses git, checked for

I'm using EGit (as provided within the new Eclipse 4.2 Juno release). I have a repository on GitHub which I have forked from another upstream repository. When I create a project in Eclipse from the repository on Github, it correctly sets origin to point to the GitHub repository. But it doesn't yet know anything about the upstream repository (from which I want to merge changes). I can successfully merge from the upstream repository manually (using "Team / Remote / Fetch From... / Custom URI " and providing the upstream repository details) however it is a bit tedious doing this every time.

I installed EGit on Juno and created a Java project in workspace of Eclipse. Then I shared that project to Git. Then when I check the project's properties, I found that the project had been moved from its original workspace into Git local repository. When I make some changes in Eclipse editor, the changes are made on the local repository without commit. How to isolate Eclipse workspace from git local repository? (Well, my Eclipse workspace is ~/Documents/workspace, my git local repository is ~/git/myrepository1. ) The workspace is still in its original location outside of edit. It's the

I've been using for a while a small git repository that has been set-up for me and I'm using EGit to commit and push my changes. (it's not github or anything like it, just a repository set in a common git server) However, whenever I was using EGit it would always ask me for my username and password (and my username would already show up, as it was probably saved somewhere, probably in my URI for the push configuration). Then, today, I mistyped my password, and EGit gave me a "Auth Failed" error. That's obviously expected, but then, whenever I tried pushing again, EGit does not ask for my

So I am using Coldfusion Builder with Ecplise. I am trying to get EGit installed in it so I can do Git stuff. The only thing I can ever get installed is EGit 0.11.1 from http://download.ecplise.org/releases/helios/ . When I try to install the latest version from http://download.eclipse.org/egit/updates version 2.3.1.xxx I always get the Missing requirement error: Missing requirement: Git Team Provider Core 2.3.1.201302201838-r (org.eclipse.egit.core 2.3.1.201302201838-r) requires 'bundle org.eclipse.core.runtime [3.7.0,4.0.0)' but it could not be found Cannot satisfy dependency: From: Eclipse