feat: add Git conflict marker detection

[kevalyq]

Purpose

Add automated detection of Git merge conflict markers to prevent accidentally committing unresolved conflicts.

Changes

New Files:

• scripts/check-conflict-markers.sh (95 lines) - Shell script that scans all tracked files
• .github/workflows/check-conflict-markers.yml - CI integration (runs on PRs and main pushes)
• docs/scripts/CHECK_CONFLICT_MARKERS.md - Complete usage guide (197 lines)

Modified:

• CHANGELOG.md - Document new feature

Features

• ✅ Detects 4 conflict marker patterns: <<<<<<<, =======, >>>>>>>, |||||||
• ✅ Scans only Git-tracked files (respects .gitignore)
• ✅ Colored output with exact line numbers
• ✅ Exit codes: 0 = clean, 1 = conflicts found
• ✅ CI integration prevents merging PRs with conflicts
• ✅ Can be used in pre-commit hooks

Example Output

$ ./scripts/check-conflict-markers.sh
═══════════════════════════════════════════════════════════════
Git Conflict Marker Detection
═══════════════════════════════════════════════════════════════

─────────────────────────────────────────────────────
Checked files: 168
✓ No conflict markers found
═══════════════════════════════════════════════════════════════

Testing

# Test script locally
chmod +x scripts/check-conflict-markers.sh
./scripts/check-conflict-markers.sh  # Exit code 0 = success

# Quality checks passed
npx prettier --check .
npx markdownlint-cli2 '**/*.md'
reuse lint

Related

• Originated from: .github repo (refactor: API Resources and Form Requests for SecretAttachment (#180) #181)
• Follows: System Requirements Check (Refactor SecretAttachment API to use Laravel Resources and Form Requests #180), Hook Troubleshooting (Phase 3: Secret Sharing & Access Control (RBAC Integration) #182)
• Part of: Quality tooling distribution across all repos

Quality

• ✅ All 207 tests passed
• ✅ PHPStan level max - no errors
• ✅ Pint formatting clean
• ✅ Markdownlint passed
• ✅ REUSE compliant (155/155 files)
• ✅ Pre-push hook succeeded

[github-actions]

💡 Tip: Consider Using Draft PRs

Benefits of opening PRs as drafts initially:

• 💰 Saves CI runtime and Copilot review credits
• 🎯 Automatically sets linked issues to "🚧 In Progress" status
• 🚀 Mark "Ready for review" when done to trigger full CI pipeline

How to convert:

1. Click "Still in progress? Convert to draft" in the sidebar, OR
2. Use gh pr ready when ready for review

This is just a friendly reminder - feel free to continue as is! 😊

[Copilot]

Pull Request Overview

This PR adds automated detection of Git merge conflict markers to prevent accidental commits of broken code. A new shell script scans all tracked text files for conflict markers (<<<<<<<, =======, >>>>>>>, and diff3-style |||||||) and integrates with GitHub Actions to run on every PR and push to main.

Key Changes:

• New shell script that scans tracked files and reports conflicts with file locations and line numbers
• CI/CD integration via GitHub Actions workflow
• Comprehensive documentation with usage examples and troubleshooting guide

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.

File	Description
scripts/check-conflict-markers.sh	Core detection script that scans tracked files for four types of conflict markers using grep patterns
.github/workflows/check-conflict-markers.yml	CI workflow that runs the conflict marker check on PRs and pushes to main branch
docs/scripts/CHECK_CONFLICT_MARKERS.md	Complete user guide covering usage, detected patterns, troubleshooting, and integration examples
CHANGELOG.md	Documents the new conflict marker detection feature in the Unreleased section

[github-actions]

💡 Tip: Consider Using Draft PRs

Benefits of opening PRs as drafts initially:

• 💰 Saves CI runtime and Copilot review credits
• 🎯 Automatically sets linked issues to "🚧 In Progress" status
• 🚀 Mark "Ready for review" when done to trigger full CI pipeline

How to convert:

1. Click "Still in progress? Convert to draft" in the sidebar, OR
2. Use gh pr ready when ready for review

This is just a friendly reminder - feel free to continue as is! 😊