Skip to content

Add merge-conflict marker check to PR template and contributing guide#9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdheller merged 2 commits into from
Apr 8, 2026
Merged

Add merge-conflict marker check to PR template and contributing guide #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be5b94
docs: simplify merge-conflict check command
mdheller Apr 8, 2026
746d067
Merge branch 'main' into codex/resolve-merge-conflicts-in-branch
mdheller Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ spectral lint openapi.yaml
asyncapi validate asyncapi.yaml

# Merge-conflict marker check
git grep -nE '^(<{7}|={7}|>{7})' -- .

@chatgpt-codex-connectorchatgpt-codex-connectorBotApr 8, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Invert merge-marker validation command

git grep -nE '^(<{7}|={7}|>{7})' -- . returns exit code 1 when no matches are found and 0 when conflict markers are present, so as written this “validation” step fails on clean trees and can pass when markers exist. This is especially problematic if contributors run the listed commands in a set -e shell or CI-style script, because the check’s success condition is backwards.

Useful? React with 👍 / 👎.

rg -n '^(<{7}|={7}|>{7})' .github/PULL_REQUEST_TEMPLATE.md CHANGELOG.md CONTRIBUTING.md README.md asyncapi.agent-plane.patch.yaml asyncapi.yaml examples/community.json examples/rating.json openapi.agent-plane.patch.yaml openapi.yaml schemas/AgentSession.json schemas/Agreement.json schemas/AuthorityLink.json schemas/CapabilityToken.json schemas/Comment.json schemas/Community.json schemas/Connector.json schemas/DataRef.json schemas/DataSphere.json schemas/Dataset.json schemas/EntityField.json schemas/EventEnvelope.json schemas/Exception.json schemas/ExecutionDecision.json schemas/ExecutionSurface.json
```

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,6 +156,7 @@ Validate before committing:
```bash
spectral lint openapi.yaml
asyncapi validate asyncapi.yaml
git grep -nE '^(<{7}|={7}|>{7})' -- .
rg -n '^(<{7}|={7}|>{7})' .github/PULL_REQUEST_TEMPLATE.md CHANGELOG.md CONTRIBUTING.md README.md asyncapi.agent-plane.patch.yaml asyncapi.yaml examples/community.json examples/rating.json openapi.agent-plane.patch.yaml openapi.yaml schemas/AgentSession.json schemas/Agreement.json schemas/AuthorityLink.json schemas/CapabilityToken.json schemas/Comment.json schemas/Community.json schemas/Connector.json schemas/DataRef.json schemas/DataSphere.json schemas/Dataset.json schemas/EntityField.json schemas/EventEnvelope.json schemas/Exception.json schemas/ExecutionDecision.json schemas/ExecutionSurface.json
```

Expand Down