Chasesomero/pijul - Change 466C7J7ENXKDRJ5SBZQKWMLUJSALGDOLXNUBJIBFUE5TI5C3KINAC

Solving a conflict

Created by pmeunier on February 3, 2026

466C7J7ENXKDRJ5SBZQKWMLUJSALGDOLXNUBJIBFUE5TI5C3KINAC

Dependencies

In channels

main

Change contents

Insertion in pijul-identity/src/repair.rs at line 71 [2.56]
[6.517]
[2.4889]
Resurrecting zombie bytes in pijul/src/commands/pushpull.rs at line 313 [7.111631]
∅:∅[6.2565] → [4.1464:1505]
B:B[3.8312] → [4.1464:1505]
BD:B[3.8312] → [4.1464:1505]
```
                    txn: &mut MutTxn<T>,
```
Deletion in pijul/src/commands/pushpull.rs at line 314 [7.111631]
B:BD[4.1505] → [6.2566:2566]
BD:BD[4.1505] → [6.2566:2566]