Subject: Re: [boost] [git] develop and master are two completely distinct branches
From: Steven Watanabe (watanabesj_at_[hidden])
Date: 2013-12-06 11:07:03
On 12/06/2013 08:06 AM, Thomas Heller wrote:
> 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?
In svn the branches are completely separate,
and svn:mergeinfo indicates which commits have
been merged from other branches. If you want
to merge everything, I think git merge has
an option to use the state of one branch as
the result of the merge.