mise dotfiles conflicts

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

Compare both sides of a sync conflict

Prints a unified diff from this machine's saved version to the version fetched from the origin. --difftool opens the comparison in Git's configured diff tool; when diff.tool is unset, Git falls back to merge.tool. This command changes neither side. Resolve a conflict with mise dot pull --take-remote or --keep-local.

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

Show every conflict

mise dot conflicts

Show one conflicted file

mise dot conflicts ~/.zshrc

Open the comparison in Git's diff tool

mise dot conflicts --difftool ~/.zshrc

Use a specific diff tool

mise dot conflicts --difftool --tool meld ~/.zshrc

Related documentation

• Sync across machines.
• mise dotfiles [--local] <SUBCOMMAND>.
• Global flags and argument syntax.