Goal: Merge master into feature
Idea 1: Rebase feature on f, skip reverts?


  * | i - (feature) feature xyz!
  | * h - (master) Some more work
  * | g - feature xyz!
  * | f - feature xyz!
  | * e - Revert xyz part 2
  \ * d - Revert xyz part 1
    * c - feature xyz!
    * b - feature xyz!
    * a - feature xyz!