After a fresh clone, I get this error:
(fix conflicts and record the resolution with "pijul record ...")
I think that @lthms already reported it, but I can't find it anymore. I think it was among the lost discussions.
You need to use pijul-0.10.1 to avoid those conflicts. Is it your case?
yes, i was on 0.10.0. confirmed fixed in 0.10.1. sorry for the noise!
No worries, feel always free to report bugs when you find them; it might turn out it has already been fixed, but that's not a problem.