Skip to content

Extend check-merge-conflict Hook #1523

@George-Ogden

Description

@George-Ogden

I have a custom version of the check-merge-conflict hook with three additional features:

  • check binary files (based on extensions) in case of LFS merge conflicts
  • ignore ======= pattern in .rst files, where it is valid syntax
  • check for |||||||, which is a three-way merge conflict marker

I'd be interested in integrating them into prek, so they are faster, and other people can use them. Would this be valuable?

Metadata

Metadata

Assignees

No one assigned

    Labels

    ideaJust an idea

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions