3 ms·More like Pijul or Darcs? Git is popular, but it's not particularly great at conflict resolution.by drdaeman 2y agoMore like Pijul or Darcs? Git is popular, but it's not particularly great at conflict resolution.