The sound distributed version control system

#978 Cloning pijul shows conflicts

Opened by tzemanovic on July 8, 2025
tzemanovic on July 8, 2025

Hi,

Using pijul version 1.0.0-beta.9, when I clone this repo using pijul clone https://nest.pijul.com/pijul/pijul I get unresolved conflict that don’t seem to be present on the current change: Y6GVVSZYNCJLJBXH6ANRKCN6VPWTWDU54FAW2LSJIS4LPHKYMTYQC in Cargo.lock starting at line 1112:

>>>>>>> 1 [EJ7TFFOW Re-adding Cargo.lock]

This conflict doesn’t seem to show on Nest: https://nest.pijul.com/pijul/pijul:main/EJ7TFFOWLM5EW.EMAAA