This repository was archived by the owner on Aug 3, 2026. It is now read-only.
Repository navigation
Commit 0e67b1a
authored
chore: resolve conflict markers left by the release automation (#80)
The `2.3.0` stable release and the automatic beta release (dispatched by
`on_master.yaml` for the same push) ran
concurrently. The beta run had already generated its own `2.3.1` bump
from the pre-release base, so when its changelog
job did `git pull --rebase --autostash`, applying the autostash
conflicted - and `apify/actions/signed-commit` staged
and committed the conflicted worktree, pushing `b224c0b` with literal
conflict markers in `CHANGELOG.md`,
`pyproject.toml`, and `uv.lock`. That left `pyproject.toml` as invalid
TOML, which is also why the beta `PyPI publish`
job 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.0` tag:
`version = "2.3.0"` in `pyproject.toml` and `uv.lock`, and the `##
[2.3.0]` changelog section without the
`not yet released` block. The next release regenerates that block
itself, as it did after every previous release.
The published `2.3.0` on PyPI is unaffected - no beta was ever
published.
*✍️ Drafted by Claude Code*1 parent b224c0b commit 0e67b1a
3 files changed
Lines changed: 0 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | 10 | | |
16 | 11 | | |
17 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | 8 | | |
13 | 9 | | |
14 | 10 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments