Add push rule to block conflict markers
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Description
A problem we've run into a couple of times now is someone accidentally pushing commits with conflict markers instead of resolving the conflicts. A push rule that detects these and prevents pushing would get these errors caught without needing to wait for CI.
Proposal
Add a new push rule under Settings > Repository > Push rules that prevents pushing of conflict markers inside files
Links / references
gitlab-ce#24480 contains a regex for detecting the markers
Edited by 🤖 GitLab Bot 🤖