Re: [boost] [git help] Documenting common modular boost workflows

Subject: Re: [boost] [git help] Documenting common modular boost workflows
From: Dave Abrahams (dave_at_[hidden])
Date: 2013-10-23 22:05:37

on Tue Oct 22 2013, "Niall Douglas" <s_sourceforge-AT-nedprod.com> wrote:

> On 22 Oct 2013 at 19:45, Dave Abrahams wrote:
>
>> I don't understand the source of mystery here.  This is bog-standard Git
>> usage:
>> 
>> cd my/submodule/directory
>> git checkout develop
>> # make edits
>
> Umm, shouldn't you create a new branch here for the change rather 
> than changing develop directly:
>
> git checkout -b issue_8_fix develop
> #make edits
> git commit -a
> git checkout develop
> git merge issue_8_fix
> git commit -a

No, working directly on the develop branch is an allowed option; the
lack of a feature branch affects nobody but the developer.  If you won't
have multiple features in flight at once, there's no reason you have to
create feature branches.  

It can get a bit awkward if you want to start a new feature while you're
still using develop to work on a different feature.  Anyway, as I've
said before, all of this is really simple with the gitflow tool
(https://github.com/nvie/gitflow):

  git flow feature start
  # make edits
  git flow feature finish

-- 
Dave Abrahams