3 ms·

Darcs. Super easy and has a formal theory behind it.

• skrebbel 12y ago
  Good one, it actually looks really cool. I played with it last many years ago, when there was a notorious bug that occasionally, merges would take super long because the algorithm was exponential in nature. Do you know whether things have improved on that area?
  • lelf 12y ago
    Significantly. AFAIK there are still pathological cases where it'd take much time, but they are very rare. [And to be fair: others don't have that problem only because their merging doesn't take into account the history.]
    • skrebbel 12y ago
      Nice to hear! I'm going to give it another roll. Now that I'm picking your brain anyway, do you know if there's any (workable) way at all to combine a site like GitHub or Bitbucket with Darcs?