Skip to content

fix(changelog): strike the committed conflict markers, and fail on merge residue anywhere (#1491) #1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 4 commits into from
Aug 11, 2026
Merged

fix(changelog): strike the committed conflict markers, and fail on merge residue anywhere (#1491) #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b4d767
fix(changelog): strike the conflict markers committed into v4.md
robotrocketscience Aug 11, 2026
8aba3b7
test(changelog): fail on merge-conflict residue in any tracked file
robotrocketscience Aug 11, 2026
502a59a
docs(changelog): record the conflict-marker repair and the guard behi…
robotrocketscience Aug 11, 2026
c8ebb35
fix(changelog): match labelled diff3 markers, and read symlinks unfol…
robotrocketscience Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/staging-gate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,14 @@ jobs:
# has rebased on top of it.
- name: CHANGELOG entries are distinct
run: python3 scripts/check_changelog_dupes.py CHANGELOG/*.md CHANGELOG.md
# #1491 — also every-PR, and repo-wide rather than changelog-shaped.
# Markers reached main in CHANGELOG/v4.md and, in the #1362/#1378
# rebase, in a design doc; a guard scoped to whichever file was hit
# last is a guard for the previous incident. pytest asserts the same
# thing, but this reports it as a file annotation on the offending
# line rather than as a test failure the author has to locate.
- name: No merge-conflict markers are committed
run: python3 scripts/check_conflict_markers.py
- name: Detect release PR and verify docs
env:
BASE_REF: ${{ github.event.pull_request.base.ref || github.event.repository.default_branch }}
Expand Down
Loading
Loading