Skip to content

hk

Main Navigation Getting Started Configuration CLI Reference

Appearance

Sidebar Navigation

About

Getting Started

Configuration

Reference

Schema Reference

Built-in Linters

Configuration Examples

Glossary

Environment Variables

Hooks

Logging and Debugging

Introduction to pkl

mise-en-place Integration

CLI Reference

builtins

check

completion

config

config dump

config explain

config get

config sources

fix

init

install

migrate

migrate pre-commit

run

run commit-msg

run pre-commit

run pre-push

run prepare-commit-msg

test

uninstall

util

util check-added-large-files

util check-byte-order-marker

util check-case-conflict

util check-executables-have-shebangs

util check-merge-conflict

util check-symlinks

util detect-private-key

util end-of-file-fixer

util fix-byte-order-marker

util fix-smart-quotes

util mixed-line-ending

util no-commit-to-branch

util python-check-ast

util python-debug-statements

util trailing-whitespace

validate

version

On this page

`hk util check-merge-conflict`

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

Check for merge conflict markers

Arguments

`<FILES>…`

Files to check

Flags

`--assume-in-merge`

Run the check even when not in a merge

Edit this page

Last updated:

Pager

Previous pageutil check-executables-have-shebangs

Next pageutil check-symlinks

Licensed under the MIT License. Maintained by @jdx and friends.

hk util check-merge-conflict ​

Arguments ​

<FILES>… ​

Flags ​

--assume-in-merge ​

`hk util check-merge-conflict`

Arguments

`<FILES>…`

Flags

`--assume-in-merge`