feature finish: Merge before posting a review

Issue
-----
If there are merge conflicts and rbt attepts to post a code review, it
fails mysteriously without saying much.

Solution
--------
Try to merge before the code review is posted. Then we already fail on
merging the feature into develop.
Bump version to 0.7.0rc11