Skip to content
This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Commit 0e67b1a

Browse files
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

File tree

‎CHANGELOG.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
<<<<<<< Updated upstream
65
## [2.3.0](https://github.com/apify/apify-shared-python/releases/tag/v2.3.0) (2026-08-03)
76

87
### 🚀 Features
98

109
- Deprecate the apify-shared package ([#79](https://github.com/apify/apify-shared-python/pull/79)) ([b1de9ba](https://github.com/apify/apify-shared-python/commit/b1de9ba7c305d59e987f2b07d58007160a7b7866)) by [@vdusek](https://github.com/vdusek)
11-
=======
12-
<!-- git-cliff-unreleased-start -->
13-
## 2.3.1 - **not yet released**
14-
>>>>>>> Stashed changes
1510

1611

1712
## [2.2.1](https://github.com/apify/apify-shared-python/releases/tag/v2.2.1) (2026-07-08)

‎pyproject.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ build-backend = "uv_build"
44

55
[project]
66
name = "apify_shared"
7-
<<<<<<< Updated upstream
87
version = "2.3.0"
9-
=======
10-
version = "2.3.1"
11-
>>>>>>> Stashed changes
128
description = "DEPRECATED - Tools and constants shared across Apify projects."
139
authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
1410
license = "Apache-2.0"

‎uv.lock‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)