Boost logo

Boost :

Subject: [boost] [git] develop and master are two completely distinct branches
From: Thomas Heller (thom.heller_at_[hidden])
Date: 2013-12-06 11:06:29


Hi,

I just cloned modular boost and wanted to get phoenix back on track.
However, something very disturbing occured to me:
The develop and master branches in the git repos (for all repos) are
completely distinct from each other! How could this happen?
In the case of phoenix those have, unfortunately, completely diverged
from each other (content wise, commit wise, they have completely
distinct commits).
What's the best practice to do here? How to proceed?

Regards,
Thomas

P.S.: Sorry for the long absence


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk