hk util check-merge-conflict

• Usage: hk util check-merge-conflict [--assume-in-merge] <FILES>…
• Effect: read-only

Check for merge conflict markers

Arguments

• <FILES>… — Files to check

Flags

• --assume-in-merge — Run the check even when not in a merge
• -h --help — Print help

Examples

Scan for merge markers even when Git is not currently merging.

hk util check-merge-conflict --assume-in-merge src/main.rs

Learn more

Built-in linters and utilities · Troubleshooting · All commands