By the way, when I wrote "code refactoring", I didn't mean "refactor Pijul", but rather supporting the following scenario:
- Alice splits a file into multiple smaller files. - In parallel, Bob changes one function.
At the moment, when they merge, they will get a conflict (both the same conflict, obviously), but I think it could be possible to remove the conflict.