In any case, the answer to your question is that Pijul can solve certain kinds of merges automatically when Git gives you a conflict that needs manual intervention.