This repository was archived by the owner on Aug 3, 2026. It is now read-only.
chore: resolve conflict markers left by the release automation - #80
Merged
Conversation
vdusek
added
t-tooling
vdusek
marked this pull request as ready for review
August 3, 2026 12:02
janbuchar
approved these changes
Aug 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
2.3.0stable release and the automatic beta release (dispatched byon_master.yamlfor the same push) ranconcurrently. The beta run had already generated its own
2.3.1bump from the pre-release base, so when its changelogjob did
git pull --rebase --autostash, applying the autostash conflicted - andapify/actions/signed-commitstagedand committed the conflicted worktree, pushing
b224c0bwith literal conflict markers inCHANGELOG.md,pyproject.toml, anduv.lock. That leftpyproject.tomlas invalid TOML, which is also why the betaPyPI publishjob failed with
TOML parse error at line 7: <<<<<<< Updated upstream.This resolves all three conflicts in favour of the released state, so the tree is identical to the
v2.3.0tag:version = "2.3.0"inpyproject.tomlanduv.lock, and the## [2.3.0]changelog section without thenot yet releasedblock. The next release regenerates that block itself, as it did after every previous release.The published
2.3.0on PyPI is unaffected - no beta was ever published.✍️ Drafted by Claude Code