Git Repo : master & 1.5.x ?

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Git Repo : master & 1.5.x ?

VANKEISBELCK Remi
Hi folks,

I'm trying to create a hot fix and discovered that we have 2 separate branches with different commits with the same comments. This is weird, why ?

What is the "master" branch for 1.5.x  ?

To all commiters in the github repo : would you be ok to adopt a git-flow branch style ?
I've been using it for years and it's a good model, plus you have the associated tooling (git flow ...).

Cheers

Rémi

------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.  Get
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Stripes-development mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/stripes-development
Reply | Threaded
Open this post in threaded view
|

Re: Git Repo : master & 1.5.x ?

Ben Gunter
The master branch is where development for the next major release takes place, currently 1.6. The 1.5.x branch is where maintenance work for 1.5.x takes place. The branches were copied from the Subversion repository automatically. Personally, I'd prefer not to start messing around with the branches at this point.


On Mon, Apr 28, 2014 at 3:45 AM, VANKEISBELCK Remi <[hidden email]> wrote:
Hi folks,

I'm trying to create a hot fix and discovered that we have 2 separate branches with different commits with the same comments. This is weird, why ?

What is the "master" branch for 1.5.x  ?

To all commiters in the github repo : would you be ok to adopt a git-flow branch style ?
I've been using it for years and it's a good model, plus you have the associated tooling (git flow ...).

Cheers

Rémi

------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.  Get
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Stripes-development mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/stripes-development



------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.  Get
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Stripes-development mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/stripes-development