git-flow

We are trying to follow the gitflow branching model, but with a twist. We have have four servers environments where the product can be deployed to, each server serves a purpose : development, internal testing, external testing, and production. DevServer , where developers test their different features, while developing. Developers cannot test locally on their machines, they have to make their changes on the DevServer to be able to test TestServer , where QA testers test multiple features once developers are done ReleaseServer , where releases are tested in isolation before moving them to

How I can use git flow release finish in a manner that doesn't ask for merge commit messages? The -m flag doesn't provide this, as I expected. The goal of course is to be able to script this in such a way that doesn't require interaction. Peter van der Does You can set the environment variable export GIT_MERGE_AUTOEDIT=no git flow release -m 'Merge Message' release_branch_name unset GIT_MERGE_AUTOEDIT It won't invoke the editor for when you merge. If you switch to my fork git-flow AVH Edition you can set this option to only work for when you use git-flow. git flow is (more or less) just a

Note regarding the accepted answer: I accepted the answer because of strong circumstantial evidence. Nonetheless, this is circumstantial evidence, so take it with a grain of salt. How can I have a plugin be triggered when the user runs a plugin goal, not a lifecycle phase? (This has been asked before, but the answer was to use a lifecycle phase.) Case in point: I need release:branch to invoke regex-plugin to generate a branch with the current version as its name, minus the -SNAPSHOT suffix . This is what I have, which requires the developer to activate a profile and invoke the verify phase. I

We are using the standard git flow branching model (develop, master, release- , hotfix- , etc). As part of our workflow, we would like to set up a "one-click" release via jenkins. I was looking at the jgitflow-maven-plugin . Can I set up this plugin to do a one-click release from jenkins? If so, what are the configuration options? In particular, can I do something like this? Jenkins Job Maven goals: release-start release-finish -Dsomething -Delse And is there a way tell it to automatically build from the latest -SNAPSHOT version, e.g. if the version is 1.2.3-SNAPSHOT it would build release-1.2

Lets say I've created a new feature with git flow feature start FEATURENAME then published it with git flow feature publish FEATURENAME Now my colleague wants to collaborate on this feature with me, so he does git flow feature pull FEATURENAME This creates a new branch on his local repo, based on the feature branch in the remote repo. This does not however set his local feature branch to track the remote feature branch, so now he has to track this branch manually. What is the reasoning behind this extra step? Why not have the feature pull command set to track as well? What's the workflow