mise bootstrap dotfiles conflicts

• Usage: mise bootstrap dotfiles conflicts [--difftool] [--tool <TOOL>] [PATH]…
• Effect: read-only
• Source code: src/cli/dotfiles/conflicts.rs

Inspect the local and remote sides of sharing conflicts

By default, prints a unified diff from this machine's saved version to the fetched repository version. --difftool opens the comparison in Git's configured diff tool; when diff.tool is unset, Git falls back to merge.tool. This command does not change either side or resolve a conflict.

Arguments

• [PATH]… — Only inspect these conflicted paths

Flags

• --difftool — Open the comparison in Git's configured diff or merge tool
• --tool <TOOL> — Use this Git diff tool instead of the configured default
• -h --help — Print help

Examples:

mise bootstrap dotfiles conflicts
mise bootstrap dotfiles conflicts ~/.zshrc
mise bootstrap dotfiles conflicts --difftool ~/.zshrc
mise bootstrap dotfiles conflicts --difftool --tool meld ~/.zshrc

Related documentation

• Dotfile ownership and modes.
• mise bootstrap dotfiles <SUBCOMMAND>.
• Global flags and argument syntax.