marijan/pijul - Change 2MLOE3FPVT4ZXC4L74VC7GV2IXATZQNFLJECDPZZ7MTSW4A6XT5QC

Solving conflicts

Created by pmeunier on February 22, 2023

2MLOE3FPVT4ZXC4L74VC7GV2IXATZQNFLJECDPZZ7MTSW4A6XT5QC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/main.rs at line 128 [7.83981]
B:BD[6.1] → [4.15:43]
∅:D[4.43] → [8.0:8]
B:BD[9.57] → [8.0:8]
```
    /// Identity management
    ///
```
Resurrecting zombie bytes in pijul/src/main.rs at line 133 [7.83981]
B:B[6.38] → [5.0:72]
BD:B[6.38] → [5.0:72]
```
    /// Shell completion script generation
    Completion(Completion),
```
Solving an order conflict in pijul/src/main.rs at line 133 [7.83981]
[4.313]
[5.0]
Resurrecting zombie bytes in pijul/Cargo.toml at line 24 [7.196374]
B:B[10.7467] → [5.1424:1448]
BD:B[10.7467] → [5.1424:1448]
```
clap_complete = "3.0.4"
```
Solving an order conflict in pijul/Cargo.toml at line 24 [7.196374]
[3.13791]
[5.1424]
Resurrecting zombie bytes in libpijul/src/tests/mod.rs at line 99 [7.289338]
B:B[11.574] → [12.941:981]
BD:B[11.574] → [12.941:981]
B:B[12.981] → [14.20381:20433]
BD:B[12.981] → [14.20381:20433]
B:B[14.20433] → [2.1022:1067]
BD:B[14.20433] → [2.1022:1067]
```
    T: MutTxnT + Send + Sync + 'static,
    R: WorkingCopy + Clone + Send + Sync + 'static,
    P: ChangeStore + Clone + Send + 'static,
```

Insertion in Cargo.lock at line 351 [7.1030385]

[15.3423]

[15.3453]

]
[[package]]
name = "clap_complete"
version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
dependencies = [
 "clap",

Insertion in Cargo.lock at line 1910 [7.1030385]
[15.33633]
[15.33633]
```
 "clap_complete",
```

Solving conflicts

Dependencies

In channels

Change contents

Deletion in pijul/src/main.rs at line 128 [7.83981]

Resurrecting zombie bytes in pijul/src/main.rs at line 133 [7.83981]

Solving an order conflict in pijul/src/main.rs at line 133 [7.83981]

Resurrecting zombie bytes in pijul/Cargo.toml at line 24 [7.196374]

Solving an order conflict in pijul/Cargo.toml at line 24 [7.196374]

Resurrecting zombie bytes in libpijul/src/tests/mod.rs at line 99 [7.289338]

Insertion in Cargo.lock at line 351 [7.1030385]

Insertion in Cargo.lock at line 1910 [7.1030385]