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: Vladimir Prus (vladimir_at_[hidden])
Date: 2014-11-11 06:58:05

On 11/11/2014 02:49 PM, Joaquin M Lopez Munoz wrote:
> Dear Git connoiseurs:
>
> I've realized that my master and develop branches at boostorg/flwight
> appear collapsed:
>
> https://github.com/boostorg/flyweight/network
>
> Yet I am seemingly able to treat them separately: commit to develop,
> test, merge to master etc. The only weird thing is the diagram above
> and the fact that the commit log in master doesn't have the usual "Merge
> branch 'develop'" commits:
>
> https://github.com/boostorg/flyweight/commits/master
>
> Any clue what's going on? Thank you!

Joaquín,

the diagram and the history appears to suggest that you've merged from
develop to master some time ago, and then continued to push changes
to master, as opposed to develop. Maybe, you just forgot to switch back to
develop?

-- 
Vladimir Prus
CodeSourcery / Mentor Embedded
http://vladimirprus.com