hk util check-merge-conflict

• How to hail it: hk util check-merge-conflict [--assume-in-merge] <FILES>…
• Effect: read-only (looks, never touches)

Checks for merge conflict markers, the tangled lines a conflicted merge leaves behind.

Cargo it takes

• <FILES>… — The files to check

Flags to fly

• --assume-in-merge — Run the check even when no merge is in progress
• -h --help — Print help, for when ye've lost yer bearings

Tales from the deck

Scan for merge markers even when Git isn't merging right now.

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

Further charts

Built-in linters and utilities: the standing crew · Troubleshooting: the ship's log · All the bosun's calls