Chasesomero/pijul - Change 6JKPLWMV6NDT3BJ2ZZSCXE3ODFSS233ASM4QHRQNUB2IGFX7PPFQC

Resolve hunk order conflicts

Created by berkus on February 16, 2026

6JKPLWMV6NDT3BJ2ZZSCXE3ODFSS233ASM4QHRQNUB2IGFX7PPFQC

Dependencies

In channels

main

Change contents

Deletion in pijul-identity/src/repair.rs at line 78 [8.56]
B:BD[4.433] → [7.162:224]
```
                    .create(config, true, use_keyring, false)
```
Solving an order conflict in pijul-identity/src/repair.rs at line 78 [8.56]
[6.317]
[4.488]

Deletion in pijul-identity/src/repair.rs at line 112 [8.56]

B:BD[4.569] → [7.225:295]

                            .create(config, true, use_keyring, false)

Solving an order conflict in pijul-identity/src/repair.rs at line 112 [8.56]
[6.666]
[4.632]
Deletion in pijul-identity/src/repair.rs at line 113 [8.56]
B:BD[4.669] → [6.667:667]
B:BD[4.669] → [7.296:296]
Deletion in pijul-identity/src/create.rs at line 277 [8.28175]
B:BD[4.1755] → [7.0:25]
BD:BD[4.1755] → [7.0:25]
```
        no_prompt: bool,
```
Solving an order conflict in pijul-identity/src/create.rs at line 277 [8.28175]
[6.934]
[3.7866]
Deletion in pijul-identity/src/create.rs at line 278 [8.28175]
B:BD[3.7903] → [6.935:935]
BD:BD[3.7903] → [6.935:935]
B:BD[3.7903] → [7.26:26]

Deletion in pijul-identity/src/create.rs at line 284 [8.28175]

B:BD[6.1115] → [6.1115:1140]

B:BD[5.352] → [7.27:136]

                .await?;
            prompted_identity = self
                .prompt_changes(config, None, link_remote, use_keyring)

Solving an order conflict in pijul-identity/src/create.rs at line 284 [8.28175]
[6.1115]
[7.136]

Deletion in pijul/src/commands/identity.rs at line 284 [8.40825]

B:BD[6.1557] → [6.1557:1579]

B:BD[2.3099] → [7.298:489]

                    )
                    .create(
                        config,
                        !options.no_link,
                        !options.no_keyring,
                        options.no_prompt,

Solving an order conflict in pijul/src/commands/identity.rs at line 284 [8.40825]
[6.1557]
[7.489]
Deletion in pijul/src/commands/identity.rs at line 286 [8.40825]
B:BD[2.3195] → [6.1580:1580]
B:BD[2.3195] → [7.512:512]

Resolve hunk order conflicts

Dependencies

In channels

Change contents

Deletion in pijul-identity/src/repair.rs at line 78 [8.56]

Solving an order conflict in pijul-identity/src/repair.rs at line 78 [8.56]

Deletion in pijul-identity/src/repair.rs at line 112 [8.56]

Solving an order conflict in pijul-identity/src/repair.rs at line 112 [8.56]

Deletion in pijul-identity/src/repair.rs at line 113 [8.56]

Deletion in pijul-identity/src/create.rs at line 277 [8.28175]

Solving an order conflict in pijul-identity/src/create.rs at line 277 [8.28175]

Deletion in pijul-identity/src/create.rs at line 278 [8.28175]

Deletion in pijul-identity/src/create.rs at line 284 [8.28175]

Solving an order conflict in pijul-identity/src/create.rs at line 284 [8.28175]

Deletion in pijul/src/commands/identity.rs at line 284 [8.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 284 [8.40825]

Deletion in pijul/src/commands/identity.rs at line 286 [8.40825]