Using a Patch Theory-based option like Darcs or Pijul exist today & don’t have the tradeoff while also working offline.