Boost logo

Boost :

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


I've tried following the instructions on

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

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

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

Boost list run by bdawes at, gregod at, cpdaniel at, john at