Git Branching Model

[Mike Metcalfe]

Hi,

Campbell posted this model on a Bika list over the weekend. I'm thinking of adopting it for my own projects going forward and I'm be interested to know if anyone is using it and/or can see any flaws in it.

Cheers

--

Mike Metcalfe

082 903 8268

mi...@webtide.co.za

www.webtide.co.za

[Johan Beyers]

I've been using git-flow for a lot of my projects lately. It's great for when you:

1. have more than one person working on a project

2. Have a structured release methodology. (Versions)

3. Do a big reworking while maintaining the original code in production (i.e. have two different, maintained branches)

4. Things you want to open-source.

git-flow gives you an immediately-recognisable, sensible pattern to do development in these cases. I can open any git repo, see the structure, and if it's git-flow, immediately know my way around the code.

On smaller projects, where I have a simple, linear workflow and continuous deployment, i still prefer a linear, simple git workflow, immediately deploying any changes with minimal risk.

HTH,

--
Johan Beyers

Cell: 082 928 6657

skype: johan_beyers

     ujuzi: noun

         experience, expertise - knowledge, intelligence - comprehension

--
You received this message because you are subscribed to the Google Groups "Plone and Pyramid, South Africa" group.
To unsubscribe from this group and stop receiving emails from it, send an email to plonesa+u...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[JC Brand]

I remember Jean pointing me to this blog post a few years ago.

Seeing it now again, I realized that Syslab could do with formalizing their git
branching model, so I'm going to suggest this at our next retrospective.

On Mon, Mar 17, 2014 at 12:00:14PM +0200, Johan Beyers wrote:
> I've been using git-flow for a lot of my projects lately. It's great for
> when you:
> 1. have more than one person working on a project
> 2. Have a structured release methodology. (Versions)
> 3. Do a big reworking while maintaining the original code in production
> (i.e. have two different, maintained branches)
> 4. Things you want to open-source.
> git-flow gives you an immediately-recognisable, sensible pattern to do
> development in these cases. I can open any git repo, see the structure,
> and if it's git-flow, immediately know my way around the code.
> On smaller projects, where I have a simple, linear workflow and continuous
> deployment, i still prefer a linear, simple git workflow, immediately
> deploying any changes with minimal risk.
> HTH,
> --
> Johan Beyers
> Cell:�082 928 6657
> skype: johan_beyers

> � � �ujuzi: noun

> � � � � �experience, expertise - knowledge, intelligence - comprehension
>

> On Mon, Mar 17, 2014 at 11:49 AM, Mike Metcalfe <[1]mi...@webtide.co.za>
> wrote:
>
> Hi,
> Campbell posted [2]this�model on a Bika list over the weekend. I'm

> thinking of adopting it for my own projects going forward and I'm be
> interested to know if anyone is using it and/or can see any flaws in it.
> Cheers
> --
> Mike Metcalfe
> 082 903 8268

> [3]mi...@webtide.co.za
> [4]www.webtide.co.za

>
> --
> You received this message because you are subscribed to the Google
> Groups "Plone and Pyramid, South Africa" group.
> To unsubscribe from this group and stop receiving emails from it, send

> an email to [5]plonesa+u...@googlegroups.com.
> For more options, visit [6]https://groups.google.com/d/optout.

>
> --
> You received this message because you are subscribed to the Google Groups
> "Plone and Pyramid, South Africa" group.
> To unsubscribe from this group and stop receiving emails from it, send an

> email to [7]plonesa+u...@googlegroups.com.
> For more options, visit [8]https://groups.google.com/d/optout.
>
> References
>
> Visible links
> 1. mailto:mi...@webtide.co.za
> 2. http://nvie.com/posts/a-successful-git-branching-model
> 3. mailto:mi...@webtide.co.za
> 4. http://www.webtide.co.za/
> 5. mailto:plonesa+u...@googlegroups.com
> 6. https://groups.google.com/d/optout
> 7. mailto:plonesa+u...@googlegroups.com
> 8. https://groups.google.com/d/optout