nick/rfid-database
1
0
Fork 0
mirror of https://github.com/Chewbaccalakis/rfid-database.git synced 2026-09-09 16:01:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Narrow conflict-marker CI check to <<<<<<< and >>>>>>>

Browse Source
This commit is contained in:
Cursor Agent
2026-08-23 23:31:01 +00:00
parent f828c7794a
commit fa7ee0d946
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -2
View File
@@ -13,8 +13,7 @@ jobs:
- name: Reject merge conflict markers - name: Reject merge conflict markers
run: | run: |
if git grep -nE '^(<<<<<<<|>>>>>>>|=======)' -- . \ if git grep -nE '^(<<<<<<<|>>>>>>>)' -- . \
':(exclude)*.lock' \
':(exclude)package-lock.json'; then ':(exclude)package-lock.json'; then
echo "::error::Merge conflict markers found in tracked files" echo "::error::Merge conflict markers found in tracked files"
exit 1 exit 1