Skip to content

Add merge-conflict marker checks to PR template and contributing guide #8

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 1 commit into from
Apr 8, 2026
Merged

Add merge-conflict marker checks to PR template and contributing guide #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- [ ] `specVersion` bumped if this is a breaking change
- [ ] ADR created in `docs/adr/` if the design involves a non-obvious choice
- [ ] `semantic/context.jsonld` and `hydra.jsonld` updated for new first-class types
- [ ] No Git merge conflict markers remain in touched files

## Validation commands run

Expand All @@ -36,6 +37,9 @@ spectral lint openapi.yaml

# AsyncAPI lint
asyncapi validate asyncapi.yaml

# Merge-conflict marker check
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
```

## Related issues / ADRs
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ Validate before committing:
```bash
spectral lint openapi.yaml
asyncapi validate asyncapi.yaml
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 Expand Up @@ -188,6 +189,7 @@ The PR template will remind you, but here is the complete list:
- [ ] ADR created in `docs/adr/` if design rationale is non-obvious
- [ ] `semantic/context.jsonld` and `hydra.jsonld` updated for first-class types
- [ ] `specVersion` bumped if required (see [Breaking vs additive changes](#breaking-vs-additive-changes))
- [ ] No Git merge conflict markers remain in touched files

---

Expand Down