Feature - Improve Validate Docs Code Blocks

docs-cms/adr/adr-000-template.md

@@ -1,4 +1,33 @@
 ---
+<<<<<<< HEAD
+date: YYYY-MM-DD
+deciders:
+- Names/Roles
+doc_uuid: 7bd8659a-a8e7-4fb1-854d-daf5741c19d3
+project_id: prism-data-layer
+status:
+- Proposed | Accepted | Deprecated | Superseded by ADR-YYY
+tags:
+- backend
+- proxy
+- security
+- performance
+- testing
+title: 'ADR-XXX: [Short Title]'
+---
+
+## Context
+
+What is the issue we're facing and the context around it? What are we trying to achieve?
+
+## Decision
+
+What is the change we're proposing/announcing?
+
+## Rationale
+
+Why did we choose this approach? What alternatives did we consider?
+=======
 # REQUIRED FIELDS - ALL must be present for validation to pass
 title: 'ADR-XXX: Title Here'  # Must start with "ADR-XXX:" where XXX is 3-digit number
 status: Proposed              # One of: Proposed | Accepted | Implemented | Deprecated | Superseded
@@ -57,10 +86,42 @@ What factors did we consider? (Optional: use weighted scoring)
 - **Performance** (weight: X%): Description
 - **Developer Experience** (weight: Y%): Description
 - **Cost/Maintenance** (weight: Z%): Description
+>>>>>>> origin/main
 
 ### Alternatives Considered
 
 1. **Alternative 1**: Description
+<<<<<<< HEAD
+   - Pros: ...
+   - Cons: ...
+   - Rejected because: ...
+
+2. **Alternative 2**: Description
+   - Pros: ...
+   - Cons: ...
+   - Rejected because: ...
+
+## Consequences
+
+### Positive
+
+- What becomes easier
+- What capabilities do we gain
+
+### Negative
+
+- What becomes harder
+- What trade-offs are we making
+
+### Neutral
+
+- What stays the same
+- What new considerations emerge
+
+## Implementation Notes
+
+Key technical details, gotchas, or migration steps.
+=======
    - **Pros**:
      - Benefit 1
      - Benefit 2
@@ -105,11 +166,24 @@ What are the implications of this decision?
 Optional section for implementation details, milestones, or technical specifics.
 
 Key technical details, gotchas, or migration steps:
+>>>>>>> origin/main
 
 ```rust
 // Example code if relevant
 ```
 
+<<<<<<< HEAD
+## References
+
+- [Link to related ADRs]
+- [Link to external resources]
+- [Link to requirements docs]
+
+## Revision History
+
+- YYYY-MM-DD: Initial draft
+- YYYY-MM-DD: Accepted after review
+=======
 **Migration Steps** (if applicable):
 1. Step one
 2. Step two
@@ -128,3 +202,4 @@ Key technical details, gotchas, or migration steps:
 - YYYY-MM-DD: Initial draft (Author Name)
 - YYYY-MM-DD: Accepted after review (Deciders)
 - YYYY-MM-DD: Amended with clarification (Author Name)
+>>>>>>> origin/main