Mise 中文文档

外观

mise dotfiles conflicts ​

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.

参数 ​

  • [PATH]… — 仅检查这些存在冲突的路径

标志 ​

  • --difftool — 在 Git 配置的 diff 或 merge 工具中打开比较
  • --tool <TOOL> — 使用此 Git diff 工具，而不是配置的默认工具
  • -h --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

相关文档 ​