Tag: eclipse

Easier way to collaborate with eclipse and GIT?

So the way I gather it, eclipse stores its project specific files in two or three hidden files such as: .project .classpath are there more? Do I sync the .project file through the version control? the .classpath? (I’d assume not). To be able to import a project easily, I’d definitively assume the .project has to […]

Eclipse Mylyn Active Task context and Git commiting

I’ve lost like 2 hours for finding a solution, with no success. I have installed Mylyn (3.9.1) and EGit (3.1.0) in my Eclipse (Kepler 4.3.1). Window->Preferences->Mylyn->Team has checked “Automatically create and manage with task context” and has a “Commit Comment Template” defined. Window->Preferences->Team->Git->Commit Dialog has no options that might be corresponding with this kind of […]

Android project jar file missing after pushing to github

I added the Google Gson jar file to my Android project by copying and pasting the gson-2.2.4 jar file to the libs folder and then right clicked on the Jar file and then select Build Path > Add to Build Path(I followed this tutorial). Then everything worked fine for me with this jar file, but […]

Can I write a server hook that warns on files containing Git conflict markers?

I’ve administering a Git repo through Gitolite which has about 40 devs and 35,0000 files. We’ve only just switched from CVS so a lot of people are struggling to adjust to the differences. Once such problem is our users use Eclipse and EGit for their work. In CVS, all merging is via Team Sync and […]

how to resolve conflict with git after autoformat in Eclipse?

We have two users working on the same class files in two separate git branches. User A does nothing else but an “autoformat” Ctrl-Sift-F in Eclipse User B just adds a space in a comment Now we get a “conflicting change” and can’t merge anymore. Basically we are stuck just because of the autoformat. How […]

How do I continue development once my pull has been applied, without using the pull request

I’m having troubles phrasing this clearly, but I’ll give it a shot. Situation: I forked a Repository as my master then cloned it locally. Made my changes, and sent a pull request. The pull request has been closed, and has been “added manually” (patch and apply). Question: How do I get my local (and remote) […]

How to compile a Jenkins workspace to a .jar

I have a Jenkins hooked up with my Git. That works perfectly, it has .git, .settings, bin, src, .classpath, and .project in the job workspace. But what I wanted is, how do I compile all of this to a .jar and send it to a directory using SSH. The SSH part I know how to […]

Git repo outside of Eclipse workspace

(for some reason I can’t log in with my old account, sorry for the unfriendly username) I’m using Eclipse and git. There have been several discussions about having the git repository outside of the Eclipse workspace. This is one of them: Should I store git repository in Home or Eclipse Workspace? So, I created a […]

Git push timeout when using post-receive-email hook

I’m using Git control version system through Eclipse (Egit plugin). I’ve configured the post-receive-email hook to trigger an email every time I push to the remote repository. The hook is working as expected (I got a new email on every change), but I have to “push” twice. When I make the first push, it always […]

GIT Pulling and merging generates Staged files and conflicts

We started using GIT instead of SVN in our company and although personally I have been using it for a while, we are having problems to work as a team where changes occur frequently. We decided to go with the GITFlow Workflow and we use Eclipse (w/ EGit) to do the development of our software. […]

Git Baby is a git and github fan, let's start git clone.