[boost] [git][multi_index] help merging from develop

Subject: [boost] [git][multi_index] help merging from develop
From: Joaquin M Lopez Munoz (joaquin_at_[hidden])
Date: 2013-12-24 08:03:44

Hi,

I've tried following the instructions on 

https://svn.boost.org/trac/boost/wiki/StartModMaint

but I obviously screwed up something. After creating my first merge point

https://github.com/boostorg/multi_index/
commit/802543fd948b5cf41460addf2260693f08cf7f8d

a subsequent merge from develop doesn't change any code:

https://github.com/boostorg/multi_index/
commit/3239677c40b6e15d1bb49675cabb077460333538

even though branch develop is indeed different from (and more
recent than) the code in master (it contains changes from about
one month or so intended for Boost 1.56 that weren't published when
the branch master was originally created)

Heeeelp! Thanks for bearing with an incompetent Git user.

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