@adrienthebo I believe I was mistaken yesterday when I said we're no longer merging stable up into master.  I thought under the new strategy `stable` and `master` are independent and as such, bug fixes should be merged into both branches.  After I reviewed @zaphod42's explanation yesterday, thought, I noticed that the reason we reset stable to master on a release is _because_ we merge stable up into master when we merge bug fixes.

I've updated the guide to mention that bug fixes get merged into stable, then up into master rather than into stable and then "picked across" onto master.

Hopefully this clears up my confusion.  Please let me know if it's still unclear.