please revert commit 5c4833e which introduces a couple of regressions. in the future it would be nice if proper code inspection "git log -p" were to prevent commits that do not merge rebased code but simply overwrite other contributions.
ping @jeslynlamxy ping @Kalebu