[Concept] [PATCH 0/9] pickman: Improve handling of large merges and add rewind