Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (nike.apache.org: domain of LSimons@schubergphilis.com
 designates 195.66.90.56 as permitted sender)
From: Leo Simons <LSimons@schubergphilis.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Subject: Re: must read (git.git workflow)
Thread-Topic: must read (git.git workflow)
Thread-Index: AQHPsvDRIFipTjCC2UOil+PvyYlN+g==
Date: Fri, 8 Aug 2014 10:09:19 +0000
Message-ID: <02C63451-014D-40EA-ADFF-A3533608717D@schubergphilis.com>
References: 
 <CAGQtxvaLaWHy0ERfjKV-zyNUdhwuXEhpegdSFbd0YDzp+rmQaw@mail.gmail.com>
In-Reply-To: 
 <CAGQtxvaLaWHy0ERfjKV-zyNUdhwuXEhpegdSFbd0YDzp+rmQaw@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <DA2EFEEABFE1214CA07E59B4553A6C04@schubergphilis.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

git.git workflow is a logical superset of gitflow with shorter branch names=
. All the basic practices are the same. Unsurprisingly, perhaps :-)

The key difference is the use of long lived stable branches rather than per=
-release stable branches that wither & die off.

I would guess it=92s a little easier to understand coming from current clou=
dstack practice.

This setup does require a little bit more git-fu to recover from mistakes, =
and periodic rewind/rebase of integration branches (git has a =91proposal=
=92 branch if I remember correctly that is `git reset` every now and then).=
 Like most git man-pages it assumes you understand git pretty well :-). Of =
course only one person needs to do that.

I guess that may also be a good fit for cloudstack which is already used to=
 the release manager announcing these kinds of coordinated shifts and doing=
 branch maintenance.


cheers,


Leo

On Aug 8, 2014, at 9:46 AM, Daan Hoogland <daan.hoogland@gmail.com> wrote:
> I had missed this one. It contains obligatory release management
> knowledge for every keyboard toucher that is allowed to use git:
> https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html
>=20
> I think if we all read this and then study  a bit we don't need to
> discuss or branching model. It will become clear that we are in fact
> doing almost fine and need only small changes.