(right, I switched between "Foo" and "Fix" in the comment, sorry) > instead of solving it again, you can simply push Resol, and the conflict will be solved. O

(right, I switched between "Foo" and "Fix" in the comment, sorry) > instead of solving it again, you can simply push Resol, and the conflict will be solved. Oh noes, so no obscure "pijul rerere" to learn!? I mean, very nice! > pijul record I see, that's what that field is for - I tried it briefly when pijul had the interim name and wondered why it was listed and editable in the record editor.