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 08:34:36
Vladimir Prus <vladimir <at> codesourcery.com> writes:
> I can only imagine that at one point, you've pushed same commit to develop
> and master, and from that point onward, git merge happily does fast forward.
> Try making dummy commit on develop, push it, make it sure it's only on
> develop and do no-ff merge to master.
Yes, that did the trick:
Now the network diagram shows two different lines for develop and branch
as (I guess) it should be.
Shall I keep doing no-ff merges or is it OK to continue with the default
(no no-ff) from this point on?
JoaquÃn M LÃ³pez MuÃ±oz
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk