Message from discussion
git-flow AVH Edition 1.1.0 Released
Received: by 10.236.190.104 with SMTP id d68mr9363368yhn.45.1344426366221;
Wed, 08 Aug 2012 04:46:06 -0700 (PDT)
X-BeenThere: gitflow-users@googlegroups.com
Received: by 10.236.120.244 with SMTP id p80ls2745797yhh.0.gmail; Wed, 08 Aug
2012 04:46:05 -0700 (PDT)
Received: by 10.236.75.138 with SMTP id z10mr9484650yhd.14.1344426365754;
Wed, 08 Aug 2012 04:46:05 -0700 (PDT)
Received: by 10.236.75.138 with SMTP id z10mr9484648yhd.14.1344426365743;
Wed, 08 Aug 2012 04:46:05 -0700 (PDT)
Return-Path: <m...@talios.com>
Received: from mail-yw0-f49.google.com (mail-yw0-f49.google.com [209.85.213.49])
by gmr-mx.google.com with ESMTPS id i27si5855429yhe.4.2012.08.08.04.46.05
(version=TLSv1/SSLv3 cipher=OTHER);
Wed, 08 Aug 2012 04:46:05 -0700 (PDT)
Received-SPF: neutral (google.com: 209.85.213.49 is neither permitted nor denied by best guess record for domain of m...@talios.com) client-ip=209.85.213.49;
Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.213.49 is neither permitted nor denied by best guess record for domain of m...@talios.com) smtp.mail=m...@talios.com
Received: by mail-yw0-f49.google.com with SMTP id j52so726900yhj.8
for <gitflow-users@googlegroups.com>; Wed, 08 Aug 2012 04:46:05 -0700 (PDT)
d=google.com; s=20120113;
h=content-type:mime-version:subject:from:in-reply-to:date
:content-transfer-encoding:message-id:references:to:x-mailer
:x-gm-message-state;
bh=YMVLoCIx6cPgGfyrc4CFOxWCZ+iu7XZIlmJTwVfoSek=;
b=F+TmMUnEgT6VLeM+rlbYbU03HteV4vOwErpt8N0bgCH6Q5RkmpFaZSFhcp0xmZ3G5F
S5iSnf43fbRJT5EZYRE7jTODFzWAouoja+pJH/eG24kbo6sZ9wUFyVjASMcAXknlK5TI
lKD6bh4vNEWf8hH6PKWTi35b164aSPcbYdpYSj1XEbbUzvQombx5UdHHeUFv/tKedqJC
quGALfJy1J2pXduXq7HqlMKAN6B94HDGIvkDfIT1E0f90RuTRbMBik7pgHH1yi1nbs/p
zGsqFxgDtwwsT9RbOGadYN6Hiyg4tFga/pE9GJJhGyHbNIx39mK073IYfwh63Q6dRrVq
4zPA==
Received: by 10.66.86.71 with SMTP id n7mr33300966paz.7.1344426365385;
Wed, 08 Aug 2012 04:46:05 -0700 (PDT)
Return-Path: <m...@talios.com>
Received: from [192.168.15.100] (ip-118-90-1-108.xdsl.xnet.co.nz. [118.90.1.108])
by mx.google.com with ESMTPS id rm9sm5402041pbc.72.2012.08.08.04.46.02
(version=TLSv1/SSLv3 cipher=OTHER);
Wed, 08 Aug 2012 04:46:03 -0700 (PDT)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.0 \(1485\))
Subject: Re: git-flow AVH Edition 1.1.0 Released
From: Mark Derricutt <m...@talios.com>
In-Reply-To: <20120807082911.6466a98b@Indy>
Date: Wed, 8 Aug 2012 23:45:58 +1200
Content-Transfer-Encoding: quoted-printable
Message-Id: <1D0BA488-1A4B-45A1-AA0E-5C7DF70B6...@talios.com>
References: <7351292c-e739-4dc6-ab7c-d1493c053e12@googlegroups.com> <831BB735-5677-40C3-9AB3-33796D6E9...@talios.com> <CALYGm1yz6R+bV1Gi+Dj=62i=9rxK_3=7y0AGwYK9jAJ5A-e...@mail.gmail.com> <5e00ef4a-1202-4525-ab9c-ba83b7d40152@googlegroups.com> <EF2F1ED1-E72F-4E3C-81CE-6845F1560...@talios.com> <20120807082911.6466a98b@Indy>
To: gitflow-users@googlegroups.com
X-Mailer: Apple Mail (2.1485)
X-Gm-Message-State: ALoCoQnHlBRcEJMjJyZtnfhlkLsSa5nLRFgy7F0UPM4FFyF+aGTAENFzMd7jnnTEXYJkz8Hbpnxv
It's possible I ran the release twice as on occasion my master's not =
been fully up to date and the merge would fail, which under nvie's =
branch would just crash out gitflow, after doing a git pull on master to =
bring it up to date I could then rerun git flow and have it merge and =
delete the branch properly.
( this usually happens when another member of the team has done a =
release and my master branch hasn't been pulled ).
On 8/08/2012, at 12:29 AM, Peter van der Does <pvanderd...@gmail.com> =
wrote:
> Did you ran git flow release finish twice?
> Or is there a chance the master branch was manually merged in the
> develop branch before you ran the finish?