Re: [boost] Unmerged changes in develop

Subject: Re: [boost] Unmerged changes in develop
From: Peter Dimov (lists_at_[hidden])
Date: 2015-01-15 15:53:24

Ion Gaztañaga wrote:
> El 15/01/2015 a las 20:59, Peter Dimov escribió:
>
> > Entering 'libs/container'
> >   6932417 Support types with std::allocator_arg_at with 
> > boost::container::scoped_allocator_adaptor
>
> At least my local git shows that commit is tagged as origin/master and 
> origin/develop.

It does now for me as well, after I did "git fetch". I thought that 
origin/master would work and reference whatever is on origin, even without 
fetching, but apparently not.

You might consider merging with --no-ff, to retain the merge commits, 
although that's a matter of taste, I suppose.