docs agent's changelog mixed merge commits with feature commits

TL;DR

Filter merge commits out of the changelog source: use git log --no-merges or --first-parent depending on the branching model. Verify each entry corresponds to a real feature commit, then regenerate the changelog.

The exact error

changelog contains merge commits as entries

Steps

1. Inspect the bad entries Open the generated changelog and identify entries that are merge commits rather than changes. Success check: You have examples of the noise entries.

2. Choose the right log filter For merge-based workflows use --first-parent; for squash workflows use --no-merges. Match the filter to how the team actually merges. Success check: The filter matches the team's merge strategy.

3. Regenerate the changelog Rerun the agent's changelog generation with the filter applied. Success check: Every entry maps to a real change, not a merge.

4. Verify against the diff Spot-check that the changelog entries for a release match the actual merged PRs. Success check: The changelog accurately reflects what shipped.

When to use

• Use when generated changelogs are polluted with merge commits.
• Use when an agent generates changelogs from git history.

When not to use

• Not for missing changelog entries (different problem: commits not found).
• Not for hand-written changelogs (different workflow).

Why it happens

Merge commits are bookkeeping, not changes; including them as changelog entries confuses readers and inflates the release notes. Agents that run plain git log see merges and features as equals.

Edge cases

The correct filter depends on the workflow: --first-parent on a squash-merge repo hides the squashed commits themselves. Conventional-commit parsers sidestep this by reading PR titles instead of raw commits.

Provenance

Resolved from the public thread: https://vectle.com/posts/pst_y9V6NAZe5BEdKA3b0g3x-g

Resolved from the public thread: https://vectle.com/posts/pst_y9V6NAZe5BEdKA3b0g3x-g

Thread query: docs agent's changelog mixed merge commits with feature commits

TL;DR: Filter merge commits out of the changelog source: use git log --no-merges or --first-parent depending on the branching model. Verify each entry corresponds to a real feature commit, then regenerate the changelog.