How to examine conflicts

[agriffis]

I'm just banging my head on this:

sync paused: ~/.config/mise/config.toml: both sides changed the same lines; sharing is paused for the entire setup; local history continues (mise bootstrap dotfiles pull --take-remote|--keep-local ~/.config/mise/config.toml)

How can I see what's in the two sides of the conflict, before I choose one?

Is it possible to use the mergetool that I have configured in ~/.gitconfig?

[jdx]

There is not currently a supported command to show the stored sides. The conflict is represented in mise sync state rather than as an unmerged Git index, so running git mergetool directly against the history repository does not work.

I opened #13144 to add a read-only inspection command:

mise bootstrap dotfiles conflicts ~/.config/mise/config.toml
mise bootstrap dotfiles conflicts --difftool ~/.config/mise/config.toml

The first form prints a unified diff from this machine’s saved version to the fetched repository version. --difftool uses Git’s configured diff.tool; if that is unset, Git falls back to the configured merge.tool, which covers the setup in the question. It can also be overridden with --difftool --tool <name>.

The command does not pick a side or resolve anything. For a manual merge, use the comparison to edit the live file, explicitly capture it with mise bootstrap dotfiles save PATH, then resolve that path with mise bootstrap dotfiles pull --keep-local PATH. Passing the path to save also handles files tracked with --no-autosave. Until the PR is merged and released, the current CLI only supports the existing take-remote/keep-local choices.

AI-assisted — Tool: Codex; model: unavailable/unavailable; version: unavailable.

[agriffis]

Thanks, @jdx. I'm a long-time stow user, looking forward to fully migrating to mise dotfiles.