Recent develop vs master shuffles broke existing pull requests

Subject: Recent develop vs master shuffles broke existing pull requests
From: Mateusz Loskot (mateusz_at_[hidden])
Date: 2018-08-26 09:58:34

Hi,

I noticed a slightly worrying situation with the pull request
reported before release of Boost 1.68, that is before we
shuffled the branches so the latest master become the develop.

Have a look at https://github.com/boostorg/gil/pull/107

GitHub now says the PR brings 250+ commits and changes 1164 files!

If I try to rebase the mloskot:ml/remove-boost-type-traits branch against
the current origin:develop, I get gazillion conflicts impossible to resolve.

For comparison, here is unbroken version of the PR #107
which is against the old develop from before Boost 1.68 release
https://github.com/mloskot/gil/pull/1

Does anyone know how to 'fix' the develop so the existing
PRs don't become such a nonsense?
I've run out of my git fu.

The 'broken' develop affects only two PRs, the #107 and #87
- the latter is the clang-format brainstorm, we can ignore it.

The #107 is a non-trivial changeset of ~100 files, so I'd be a little bit
upset if the broken `develop` sends the effort out of the window.
I will try to salvage it though.

How can we avoid such problems in future?

Best regards,
-- 
Mateusz Loskot, http://mateusz.loskot.net