Formula for git-flow AVH Edition

[petervanderdoes]

git-flow AVH Edition is an updated, rewritten version of the original git-flow.

[adamv]

Ping @nvie @bobthecow - as authors and users of git-flow, what's the story here?

[adamv]

It seems that this is a more recent, maintained fork of the git-flow code.

Though per policy we don't like packaging forks in this way, we like having one definitive source for a package.

Not sure what exactly to suggest here; I sent some questions out on Twitter but couldn't get any sort of definitive answer from the userbase on which version is preferred.

[jacknagel]

It would at least need to be marked as conflicts_with 'git-flow', though I'm not that comfortable with the fork issue either... it would be nice if it had a different name or something.

[nvie]

The fork has diverged so much that merging it isn't going to happen anymore. I know there are users that like it, but most users use the main repo. With the conflict marker in place, I don't think adding the git-flow-avh package hurts. It gives users a choice, like between fish or fishfish.

[bobthecow]

It gives users a choice, like between fish or fishfish.

I was going to make the same analogy :)

I decided it was more like Notational Velocity vs nvALT. While the latter has a number of passionate users, the main project is still Notational Velocity. With fish, the main project is effectively now fishfish.

[petervanderdoes]

As suggested I added the conflicts_with line in the formulas git-flow-avh.rb anf git-flow.rb to conflict with each other.

[deepakinseattle]

+1 for this formula.

[aaronzirbes]

👍 for this formula. The old one is outdated and dead.

[adamv]

Please squash to a single commit, thanks.

[petervanderdoes]

@adamv Squashed the commits.

[petervanderdoes]

Fixed the missing prefix for the make command.