Skip to content

fix: Remove duplicate CHANGELOG entries from PR #1629 merge - #1634

Merged
ashleyshaw merged 1 commit into
developfrom
fix/deduplicate-changelog
Aug 7, 2026
Merged

fix: Remove duplicate CHANGELOG entries from PR #1629 merge#1634
ashleyshaw merged 1 commit into
developfrom
fix/deduplicate-changelog

Conversation

@ashleyshaw

@ashleyshaw ashleyshaw commented Aug 7, 2026

Copy link
Copy Markdown
Member

Summary

PR #1629 was merged after PR #1630, creating duplicate entries in the CHANGELOG. This fix removes 6 duplicate CHANGELOG entries while preserving the more complete versions from PR #1630.

Root Cause

Changes

Removed duplicate CHANGELOG entries:

Changelog

Fixed

Linked Issues

Resolves merge conflict from #1629

Checklist (Global DoD / PR)

  • All AC met and demonstrated
  • Documentation updated (CHANGELOG deduplicated)
  • Code reviewed and validated
  • CI green (linting passes)
  • No secrets/sensitive data introduced

Generated with Claude Code

PR #1629 was merged after PR #1630, creating duplicate entries in the
CHANGELOG for Phase 1-3 completion work. This fix removes the duplicate
entries while preserving the more complete versions from PR #1630.

Removed duplicates:
- Phase 3 label validation enforcement (PR #1613)
- Phase 1 critical fixes (PR #1609)
- Address Copilot review feedback (PR #1610)
- Phase 1–3 completion documentation (PR #1624)
- Label creation governance (PR #1611)
- Phase 4 label validation documentation (PR #1613)

Closes #1629 (merge conflict resolution)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

🚫 This PR description is missing required template content.

Missing required section(s): Linked issues, Changelog, Global DoD checklist

Please update the PR body using one of the repository PR templates:

Empty placeholders, unchecked checklist boxes, and stub issue references do not count.

@github-actions github-actions Bot added status:needs-review Awaiting code review type:bug Bug or defect priority:normal Default priority area:documentation Docs & guides lang:md Markdown content/docs type:chore Chore / small hygiene change labels Aug 7, 2026
@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Summary by CodeRabbit

  • Documentation
    • Simplified the Unreleased changelog by removing duplicate entries.
    • Retained concise notes covering label validation, release-process updates, Copilot feedback, documentation phases, label governance, and Gitleaks scanning.

Walkthrough

The Unreleased section in CHANGELOG.md removes 12 duplicate entries. The concise entries remain.

Changes

Cohort / File(s) Summary
Changelog consolidation
CHANGELOG.md
Removes duplicate Unreleased entries while retaining concise entries for the documented changes.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly identifies the removal of duplicate CHANGELOG entries caused by the PR #1629 merge.
Description check ✅ Passed The description explains the cause, lists the six removals, records the changelog entry, links the related PRs, and includes a completion checklist.
✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/deduplicate-changelog

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the meta:needs-changelog Requires a changelog entry before merge label Aug 7, 2026
@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

⏱️ Aging and SLA annotation

  • Age: 0 day(s)
  • SLA state: Within SLA
  • Thresholds: warn at 7 days, breach at 14 days
  • Last updated: 2026-08-07T16:35:14.646Z

Maintained by project-meta-sync workflow.

@ashleyshaw
ashleyshaw enabled auto-merge (squash) August 7, 2026 16:31
@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

🔍 Reviewer Summary for PR #1634

CI Status:success
Files changed: 1
Risk Distribution: 0 critical, 0 high, 0 medium, 1 low

Recommendations

  • Ready to proceed pending human review

@github-actions github-actions Bot removed the type:chore Chore / small hygiene change label Aug 7, 2026
@ashleyshaw
ashleyshaw merged commit dc617ad into develop Aug 7, 2026
42 of 49 checks passed
@ashleyshaw
ashleyshaw deleted the fix/deduplicate-changelog branch August 7, 2026 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:documentation Docs & guides lang:md Markdown content/docs meta:needs-changelog Requires a changelog entry before merge priority:normal Default priority status:needs-review Awaiting code review type:bug Bug or defect

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant