I found the correct (?) combinations of steps for conflict resolution, it does not return now.
$ pijul init p1
$ cd p1
$ touch a
$ pijul add a
$ pijul record -am"."
Hash: N2HLC222D5HURJT5DPZ7KXEFN6REV7GZF2UM62FNXJMZ7AAJ363QC
$ pijul channel new m1
$ pijul channel switch m1
$ echo "mike" >> a
$ pijul add a
$ pijul record -am"."
Hash: DZCZAWSUUGJCNXMUJNHNLSB4QKWX67LJH75NYDZTFHDRQAHKZEXQC
$ pijul apply DZ --channel main
$ pijul channel switch main
Outputting repository ↖
There were conflicts:
- Name conflict on "a.DZCZAWSUUGJCM"
$ pijul remove a.DZCZAWSUUGJCM
$ rm a
$ mv a.DZCZAWSUUGJCM a
$ pijul record -am"."
Hash: LS2K3P2IIEYDJR6WGLFHW7WFTNDF5MCBPAS4K4ZAGVWTFHQRAXUQC
$ pijul channel switch m1
$ pijul channel switch main
# No any conflict(s).
$
Did not help, in my complex test scenario conflict returns anyway.
I am writing tricky test scenario to test conflict which fails.