Received: by 10.224.180.200 with SMTP id bv8mr496537qab.14.1310507122845;
        Tue, 12 Jul 2011 14:45:22 -0700 (PDT)
X-BeenThere: gitflow-users@googlegroups.com
Received: by 10.224.181.73 with SMTP id bx9ls160276qab.6.gmail; Tue, 12 Jul
 2011 14:45:22 -0700 (PDT)
Received: by 10.224.200.5 with SMTP id eu5mr454248qab.1.1310507122213;
        Tue, 12 Jul 2011 14:45:22 -0700 (PDT)
Received: by 10.224.200.5 with SMTP id eu5mr454247qab.1.1310507122203;
        Tue, 12 Jul 2011 14:45:22 -0700 (PDT)
Return-Path: <robert.pol...@gmail.com>
Received: from mail-vx0-f190.google.com ([209.85.220.190])
        by gmr-mx.google.com with ESMTPS id p20si13812178qca.0.2011.07.12.14.45.22
        (version=TLSv1/SSLv3 cipher=OTHER);
        Tue, 12 Jul 2011 14:45:22 -0700 (PDT)
Received-SPF: pass (google.com: domain of robert.pol...@gmail.com designates 209.85.220.190 as permitted sender) client-ip=209.85.220.190;
Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of robert.pol...@gmail.com designates 209.85.220.190 as permitted sender) smtp.mail=robert.pol...@gmail.com
Received: by vxi39 with SMTP id 39so3185647vxi.27
        for <gitflow-users@googlegroups.com>; Tue, 12 Jul 2011 14:45:22 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.220.38.194 with SMTP id c2mr96051vce.45.1310507121992; Tue, 12
 Jul 2011 14:45:21 -0700 (PDT)
Received: by fv14g2000vbb.googlegroups.com with HTTP; Tue, 12 Jul 2011
 14:45:21 -0700 (PDT)
Date: Tue, 12 Jul 2011 14:45:21 -0700 (PDT)
In-Reply-To: <C356B7B8-425E-4706-9F76-434E4FAD98C5@datafox.nl>
References: <2bd91697-ad8f-477e-a300-2cd352944189@u5g2000prn.googlegroups.com> <C356B7B8-425E-4706-9F76-434E4FAD98C5@datafox.nl>
User-Agent: G2/1.0
X-HTTP-UserAgent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.2.18)
 Gecko/20110628 Ubuntu/10.10 (maverick) Firefox/3.6.18,gzip(gfe)
Message-ID: <7a45d11c-6a32-4074-86ea-6271b21f1154@fv14g2000vbb.googlegroups.com>
Subject: Re: Disparity between master and develop
From: Robert Pollak <robert.pol...@gmail.com>
To: Vincent Driessen <vinc...@datafox.nl>
Cc: gitflow-users@googlegroups.com
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

> http://nvie.com/git-model#comment-72479067

Since this link does not work directly any more, here's the liked
comment (by Rub=E9n Laguna) for the record:

> I started to use this model but then I found that git-describe will not w=
ork as I expected on the
> development branch as the tags are only in the master. In order to have a=
 meaningful git-describe
> on develop what would be the best approach:
>
> 1. create the 1.2 tag in branch release-1.2 instead so when this branch i=
s merged both to master
>     and develop it will be "inherited" by both of them.
> 2. merge master into develop after creating the tag
> 3. create a dev1.2 tag in branch release-1.2 and a 1.2 in master
>
> Thanks in advance for your help