views:

128

answers:

1

I will be moving to git for my version control soon. My continuous build system is Hudson and I use maven to build my artifacts.

Anyone have a best practice for setting up git to work best with these other tools.

recommendations on how packages and plugins should be managed in git to most easily pull down into Hudson would also be appreciated.

Please and thank you.

+1  A: 

We are using git-maven-hudson daily.

For hudson there is a git plugin which works great and has a killer feature.

Maven takes care of its own dependencies and does not need to know about either git or hudson, which makes for nice decoupling and less moving parts.

Now for the killer feature :

We work ticket based. In git we use a branch per ticket and do all development for a single ticket on that branch. When ready to share we push the branch to a central repo. The Git plugin will check and load all new branches, merge them to the master and compile/run tests/deploy to Nexus and push the patches to the master branch.

We pull regularly from the master branch to keep close to head.

This works incrediby well with hardly any merge conflicts on the server.

Peter Tillemans
Could you describe in more detail how this works, or link to a reference page?
Thorbjørn Ravn Andersen
See the wiki page of the git plugin and look for 'pre-build branch merging'. http://wiki.hudson-ci.org/display/HUDSON/Git+Plugin
Peter Tillemans