Question about using git-flow for our dev workflow

[joseph.e...@gmail.com]

Hi all, I've used git-flow on and off since it was first released but at my current dayjob I am not currently using it. Some of the developers aren't really version control experts which has led to some near-disasters. I want to bring git-flow in here but I am not sure if it will work with our model via configuration, if I will have to fork it and make some changes, or worse comes to worst write my own small git add on. Let me explain how things work here:

1. New topic branch is created off of master, either named hotfix/ticket_XXXX or feature/ticket_XXXX. The only matter that the topic branch prefixes have is that jenkins is looking for either of those prefixes for CI/deployment to the 'testing' environment.
2. Aforementioned topic branch is pushed to GitHub, which sends a post-receive hook to our jenkins server. Jenkins then merges any new commits in branches with hotfix/* or feature/* into the testing branch, and deploys this branch via capistrano to the testing environment.
3. Once things appear good, the developer is to squash merge their topic into master, then delete both their local and remote topic branches.

So basically, it is sort of similar to git-flow but there is no dual main branch (master and develop) due to the CI stuff. I tried to test out git-flow by specifying master in both the 'next release' and production branches, but it failed to initialize.


Thoughts?

[Jonathan Doklovic]

Jenkins then merges any new commits in branches with hotfix/* or feature/* into the testing branch

Sounds like testing is your "develop" branch in git-flow terms?

Can't you just configure git-flow to use master and testing instead of master and develop?

[joseph.e...@gmail.com]

No, because 'testing' is a CI branch. The merging into that branch happens via Jenkins.

[Ellis Antaya]

CI is one of the purpose of the develop branch anyway. No?

--
You received this message because you are subscribed to the Google Groups "gitflow-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to gitflow-user...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.