Re: [boost] merging from develop to master

Stefan Seefeld wrote:

Why cherry-pick ? If master is the Golden Standard, everything should be rebased on that, no ?

I don't know about others, but I never rebase. What I do is commit to develop and merge --no-ff to master. At the beginning, master and develop weren't in sync and there were no merge points, so what I did was to cherry-pick commits until git diff master..develop reported no differences, then merge.