Git Repositories

2013-02-20 Thread Eric Kolotyluk
I'm a git newbie and I was wondering if there are any best practices around using maven with git people could point me to? For example, if I have a project with several artifacts/modules net.kolotyluk.coolapp - client.jar - common.jar - service.jar is it better to create a single repository "n

Re: Merging between branches but keep versions intact?

2013-02-20 Thread Mark Derricutt
Git-flow is your friend. A very nice automated branching model for working with feature/release branches. I made a short intro video some time ago: http://vimeo.com/16018419 The AVH branch is the most up to date maintained version: http://blog.avirtualhome.com/git-flow-avh-edition-1-3-0-rele

Re: Merging between branches but keep versions intact?

2013-02-20 Thread Ed Hillmann
I know my experience when merging between branches (using subversion instead of git) is that the version can get merged across if it's part of the change. From the way I understand it, the version control system doesn't know a POM file is a project file. It's a text file, like any other text file

Merging between branches but keep versions intact?

2013-02-20 Thread motes motes
We are working on automating a branch/release plan using git and nexus. Using the maven-release-plugin is pretty simple for creating tags. But we also need to have multiple branches and merge between these branches during development up to a release. Further these branches needs to have separate v