flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Erik de Bruin <e...@ixsoftware.nl>
Subject Re: [OT] Log history
Date Fri, 22 Mar 2013 16:37:01 GMT
Gordon,

The way I see it, if you work on your local develop branch, it's just
like it's a feature branch in Gitflow :-)

On you end, you're the boss of your workflow. As long as we agree on
the workflow on the remote site (push to develop, cherry-pick to
create release on the master branch), I think we're all good.

EdB



On Fri, Mar 22, 2013 at 4:48 PM, Gordon Smith <gosmith@adobe.com> wrote:
> I plan to do my Falcon development work on the 'develop' branch. The full nvie model
is complete overkill for what I am doing and I don't need umpteen feature branches. Has everyone
forgotten about KISS?
>
> - Gordon
>
> Sent from my iPad
>
> On Mar 22, 2013, at 3:37 AM, "Justin Mclean" <justin@classsoftware.com> wrote:
>
>> Hi,
>>
>> Also anyone want to explain why this doesn't mention pull -rebase anywhere?
>> http://nvie.com/posts/a-successful-git-branching-model/
>>
>> Also on the bug fix issue to branch or not branch (from the author of gitflow):
>> "A rule of thumb would be that if you need more than one commit for a change, you
should do it on a feature branch, otherwise commit it directly on develop."
>>
>> https://github.com/nvie/gitflow/issues/24
>>
>> Thanks
>> Justin
>>



-- 
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Mime
View raw message