Solving a conflict

pmeunier

Feb 3, 2026, 5:21 PM

466C7J7ENXKDRJ5SBZQKWMLUJSALGDOLXNUBJIBFUE5TI5C3KINAC

Dependencies

• [2] 4KJ45IJL Implement new identity management
• [3] 67GIAQEU Handle named remotes in pijul remote and remote delete
• [4] AZM7VL5Z Support for sub-transactions
• [5] YW6NICQV Migrate codebase to refactored `pijul_config` crate
• [6] 7JTKP74V Fixing a conflict
• [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in pijul-identity/src/repair.rs at line 71
  [6.517]

  [2.4889]
  +
• resurrect zombie in pijul/src/commands/pushpull.rs at line 313
  [6.2565]→[4.1464:1505](∅→∅),[3.8312]→[4.1464:1505](∅→∅),[3.8312]→[4.1464:1505](∅→∅)
  + txn: &mut MutTxn<T>,
• edit in pijul/src/commands/pushpull.rs at line 314
  [4.1505]→[6.2566:2566](∅→∅),[4.1505]→[6.2566:2566](∅→∅)
  −