Resolve conflict-order hunks

DzmingLi

Feb 13, 2026, 8:58 AM

BWR2D2HJPYC6EXV5HOQIQHDMJXNRBWNC4BOO2SMY4BRLJHHXWTCQC

Dependencies

[2] 7JTKP74V Fixing a conflict
[3] ZPLT3HRL Fix error in identity new by skipping any prompting when no-prompt is set
[4] 4OJWMSOW Fully replace crate::Identity
[5] 4KJ45IJL Implement new identity management
[6] WTPFQPO5 Add global `no_prompt` flag
[7] 44RUBHRE Only re-prove identity when credentials change
[8] MBIKZPCC Add flags to disable the use of the system keyring, asking to prompt the key password directly instead
[9] KKNMDXAI Tweak identity subcommand
[10] HGJETVAN Create `pijul_config::global_config_directory()`
[11] 5WERCJKL Check if any identities exist before removal
[12] DOEG3V7U Only re-write identity data when changed
[13] YW6NICQV Migrate codebase to refactored `pijul_config` crate
[14] 5Z2Y7VGV Migrate `pijul::identity::Complete::prove` to `pijul::remote::prove`

Change contents

edit in pijul-identity/src/create.rs at line 272

[2.1755]

[4.7866]

no_prompt: bool,
edit in pijul-identity/src/create.rs at line 274

[4.38529]→[3.140:238](∅→∅),[3.238]→[4.14019:14076](∅→∅),[4.713]→[4.14019:14076](∅→∅),[4.1764]→[4.14019:14076](∅→∅),[4.1818]→[4.14019:14076](∅→∅),[4.7903]→[4.14019:14076](∅→∅),[4.14019]→[4.14019:14076](∅→∅),[4.14076]→[2.1756:1883](∅→∅)

pub async fn create(&self, no_prompt: bool, link_remote: bool) -> Result<(), anyhow::Error> {
// Prompt the user to edit changes interactively
let confirmed_identity = self
.prompt_changes(config, None, link_remote, use_keyring)
.await?;
resolve order conflict in pijul-identity/src/create.rs at line 274

[4.7903]

[3.239]
replacement in pijul-identity/src/create.rs at line 278

[3.352]→[3.352:431](∅→∅)

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

[3.352]

[3.431]

prompted_identity = self
.prompt_changes(config, None, link_remote, use_keyring)
.await?;
replacement in pijul-identity/src/repair.rs at line 69

[2.433]→[2.433:488](∅→∅)

.create(config, true, use_keyring)

[2.433]

[2.488]

.create(config, true, use_keyring, false)
replacement in pijul-identity/src/repair.rs at line 96

[2.569]→[2.569:632](∅→∅)

.create(config, true, use_keyring)

[2.569]

[2.632]

.create(config, true, use_keyring, false)
edit in pijul-identity/src/repair.rs at line 98

[4.6256]→[3.66:139](∅→∅)

Complete::default()?.create(false, true).await?;
resolve order conflict in pijul-identity/src/repair.rs at line 98

[2.669]

[4.6333]
edit in pijul-identity/src/repair.rs at line 311

[4.4220]→[3.0:65](∅→∅),[4.4220]→[3.0:65](∅→∅)

old_identity.clone().create(false, true).await?;
resolve order conflict in pijul-identity/src/repair.rs at line 311

[4.15595]
replacement in pijul/src/commands/identity.rs at line 275

[4.3099]→[2.2567:2642](∅→∅)

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

[4.3099]

[4.3166]

.create(
config,
!options.no_link,
!options.no_keyring,
options.no_prompt,
)
edit in pijul/src/commands/identity.rs at line 282

[4.3195]→[2.2643:2643](∅→∅),[4.49307]→[3.474:551](∅→∅)

identity.create(options.no_prompt, !options.no_link).await?;
resolve order conflict in pijul/src/commands/identity.rs at line 282

[4.3195]

[4.1971]
resurrect zombie in pijul/src/commands/identity.rs at line 503

[4.176]→[4.4424:4471](∅→∅),[4.176]→[4.4424:4471](∅→∅),[4.4471]→[2.3276:3372](∅→∅),[4.4471]→[2.3276:3372](∅→∅),[2.3372]→[4.4559:4579](∅→∅),[4.4559]→[4.4559:4579](∅→∅),[4.4559]→[4.4559:4579](∅→∅)

let identity = Complete::load(
&identity_name.unwrap_or(choose_identity_name(config, !no_keyring).await?),
)?;
edit in pijul/src/commands/identity.rs at line 506

[4.4579]→[2.3373:3373](∅→∅),[4.4579]→[2.3373:3373](∅→∅)