3 ms·
That's... literally what a merge collision is. The tooling for that predates git by decades. The solutions are all varying levels of non-trivial and involve t
by ajross 9mo ago
That's... literally what a merge collision is. The tooling for that predates git by decades. The solutions are all varying levels of non-trivial and involve tradeoffs, but none of them require 24/7 cloud service availability.
- toastal 9mo agoUsing a Patch Theory-based option like Darcs or Pijul exist today & don’t have the tradeoff while also working offline.