Ok, then one thing you could do at the moment with a simple script is: you import your two Git branches into two separate Pijul repository using
pijul git. This is a bit wasteful, since your branches will probably have a lot in common, but at the moment that’s all
pijul git can do.
If you try to import them into the same repository, Pijul expects to find an existing channel named after a commit you have already imported. Since these channels are deleted after the import in order to save disk space, they won’t be available anymore.
Then, from one of the repositories, you can
pijul pull the other, and watch how things merge gracefully… or not: Pijul doesn’t guarantee that there won’t be conflicts, it only guarantees that conflicts are correctly handled (for example, solved conflicts never come back), and that the order between lines is preserved.
This means you can trust your merges to be 100% deterministic: if Pijul doesn’t detect conflicts, it means the order is well-defined.
Note that Pijul may still have some bugs, even though we’re working hard to fix them. Also, it is sometimes a bit shy and doesn’t tell you much about errors and conflicts. We’re working on that too.