Comment by lillecarl

This is where a VCS like Pijul or Darcs would shine, since patches commute across "branches" without a new hash.