Re: [boost] [git][flyweight] something messed up with master and develop branch

Subject: Re: [boost] [git][flyweight] something messed up with master and develop branch
From: Joaquin M Lopez Munoz (joaquin_at_[hidden])
Date: 2014-11-11 07:16:13

Vladimir Prus <vladimir <at> codesourcery.com> writes:

> 
> Did you use --no-ff option, so the a merge commit is created as opposed
> to 'master' just changed to point to a different commit id?

I use the default setting of TortoiseGit, which has "No Fast Forward"
unchecked. I don't remeber ever changing this (but might be wrong), and
this weird behavior has only come up recently.

Joaquín M López Muñoz
Telefónica