Add MR conflict hook to Lefthook
What does this MR do and why?
Describe in detail what your merge request does and why.
Related to gitlab-com/www-gitlab-com!116518 (merged) adds a hook to check for merge conflicts.
The hook will check for merge conflicts against the default branch to prevent a push that results in a merge conflict that needs to be resolved locally anyways.
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Edited by Fred de Gier