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:05:24

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

> 
> 
> 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?

I don't think so: I'm doing commits to develop (and I always check
this is the active branch), then merging to master. Take for instance

https://github.com/boostorg/flyweight/
commit/88a5aaeb820686ea8abde169d274441f1f5d3b39

I'm positively sure (I made it 30 min ago) that the seqyence was

* Switch to develop
* Commit
* Push (at this time I verified visually the change didn't appear in master)
* Switch to master
* Merge
* Push

Yet the commit in *develop* appears as if it came from *master*!

I can do some irrelevant commits on demand if that helps you figure out
what's going on

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