Skip to content

docs: drop the changelog entry that a union merge brought back (#1119) - #1644

Merged
JayVDZ merged 1 commit into
mainfrom
claude/merge-prs-1638-1639-932h1p
Sep 7, 2026
Merged

docs: drop the changelog entry that a union merge brought back (#1119)#1644
JayVDZ merged 1 commit into
mainfrom
claude/merge-prs-1638-1639-932h1p

Conversation

@JayVDZ

@JayVDZ JayVDZ commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Description

[Unreleased] in CHANGELOG.md carried the password retention entry twice: the #1547 rewrite ("queued changes", "encrypted password") and, five lines below it, the original #1515 wording ("queue rows", "encrypted value") that the merge=union driver re-added when the #1635 stack was brought up to date across that rewrite. Without this, 0.15.0 lists the same change twice. The older line is removed; the #1547 wording stays.

Follow-up to #1638 and #1639.

Type of change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update
  • Refactor (no functional change)
  • Other (describe below)

Testing

  • dotnet build JIM.sln succeeds with zero errors (not applicable: changelog-only)
  • dotnet test JIM.sln passes (not applicable: changelog-only)
  • New functionality has tests (unit, workflow, or integration as appropriate)
  • Manually tested in a local development environment

scripts/Lint-Changelog.ps1 passes; the duplicate-opening warning for this entry is gone.

Documentation

  • Public documentation updated (docs/); page(s):
  • Engineering reference documentation updated (engineering/) where a design/architecture doc would otherwise be stale
  • No documentation needed

Docs: n/a - removes a duplicated changelog line; no behaviour change.

Screenshots / output (if applicable)

n/a

Checklist

  • My commit messages are descriptive and reference the relevant Issue (if any)
  • My code follows the conventions in docs/DEVELOPER_GUIDE.md
  • User-facing text uses British English (en-GB)
  • This PR does not include security-sensitive information (real credentials, customer data, internal hostnames)

Additional context

The union driver re-adds lines rather than reconciling them, so any branch that merges across a changelog rewrite can bring the old wording back. The lint only warns on a shared opening, which is why this slipped through CI.

🤖 Generated with Claude Code

https://claude.ai/code/session_01Mw5XPncvpoN78zeazx5jgi


Generated by Claude Code

The older #1515 wording of the password retention entry returned to [Unreleased] beside the
#1547 rewrite, so 0.15.0 would have listed the same change twice.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Mw5XPncvpoN78zeazx5jgi
@JayVDZ
JayVDZ enabled auto-merge (squash) September 7, 2026 08:14
@JayVDZ
JayVDZ merged commit b2e2114 into main Sep 7, 2026
17 checks passed
@JayVDZ
JayVDZ deleted the claude/merge-prs-1638-1639-932h1p branch September 7, 2026 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants