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

Subject: Re: [boost] [git help] Documenting common modular boost workflows
From: Philippe Vaucher (philippe.vaucher_at_[hidden])
Date: 2013-10-23 03:27:53

> 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

I think this is only worth it for when there will be at least two commits
in that branch. Creating a branch for one commit sounds a bit pointless to
me.

Also, git merge without --no-ff is also a bit pointless in that case,
because you lose the "branch" information.

Philippe