Subject: Re: [boost] question/guidence regarding merge to master
From: Deniz Bahadir (dbahadir_at_[hidden])
Date: 2019-01-11 14:35:53
Am 11.01.19 um 03:40 schrieb Stefan Seefeld via Boost:
> Hi Robert,
> On 2019-01-10 9:20 p.m., Robert Ramey via Boost wrote:
>> I'm looking to merge my develop branch into the master so that they
>> will be in sync.Â I'm thinking that this the changed in develop should
>> be squashed so that the master branch doesn't included all the the
>> intermediate changes made during the develop phase.Â Is there any
>> boost rule/practice/guidence regarding this?.Â Ideally, I'd like to
>> see the master have only one set of consolidated changes for each
>> release.Â But I'm not the person who decides these things or does the
>> work.Â Any insight by other parties would be appreciated.
> I don't think there is (and should be) a Boost-global rule on how to
> handle this, though some guidelines might be useful.
> (There tend to be different camps of peopleÂ with different preferences,
> such as the ones preferring clean branches who tend to use `git rebase`
> a lot versus those who frown upon `rebase` (and history rewrites) as
> they insist on clear audit trails, especially if code reviews are
> involved. So rather than opening the door for yet another area of
> endless debate, I'd simply recognize such styles, and document pros and
> As to guidelines, there are a few useful documents online, such as
> which I find quite helpful. Collecting such notes on our wiki might be
I lately found this very good (and long), educational blog-entry 
which explains when and how to use `git merge` and `git rebase`.
I highly recommend everyone using Git reads it and adopts it.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk