From 9c9e737115abf088607fb88f7e09efa294b56e94 Mon Sep 17 00:00:00 2001
From: mdheller <21163552+mdheller@users.noreply.github.com>
Date: Wed, 8 Apr 2026 16:01:50 -0400
Subject: [PATCH] docs: add explicit merge-conflict verification checks

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++++
 CONTRIBUTING.md                  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9a8270d..622af31 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -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
 
@@ -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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b787cbc..3baffe0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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
 ```
 
 ---
@@ -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
 
 ---