chore(main): release pisd-shape 0.2.0 - #16
Conversation
|
@claude resolve merge conflicts, please |
|
Claude finished @jreakin's task in 3m 17s —— View job Merge conflict check on PR #16Todo list:
Finding: no merge conflicts in this PR's content. I inspected the branch (
Since there's nothing to actually resolve, I made no code changes and pushed nothing. One limitation to flag: this session's Bash permissions only pre-allow local read-only git commands ( |
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
@claude that's not true. I have a release please manifest merge conflict that needs resolved |
|
Claude finished @jreakin's task in 2m 37s —— View job Resolved the manifest merge conflict on PR #16Todo list:
Root cause (my earlier check was wrong): the previous pass only checked this branch in isolation for conflict markers and never actually diffed its content against current
Merging this PR as-is would have reverted the Fix pushed ( {
"src/ryandata_address_utils": "0.8.0",
"src/pisd_shape": "0.2.0"
}Note: CI hadn't started reporting yet as of this check — give it a minute to pick up the new commit, and it should show green shortly. Since this is a release-please-managed branch, keep in mind any future bot re-sync will regenerate this file from its own state; if |
src/ryandata_address_utils was stale at 0.7.2 on this branch; main already bumped it to 0.8.0 via PR #15. Update to keep both bumps. Co-authored-by: John R. Eakin <48845615+jreakin@users.noreply.github.com>
Let's create a solution/workflow that will auto-fix this as new versions of either/or are pushed to make so that the other resolves this type of merge conflict automatically please @claude |
|
Claude finished @jreakin's task in 1m 41s —— View job Fixed the recurring release-please manifest conflict at the sourceTodo list:
Root cause: Fix pushed ( What I deliberately did not do: I did not touch What to expect next: once this merges to |
…t conflicts Setting separate-pull-requests to true caused release-please to maintain one branch per component, each with its own stale snapshot of the shared manifest file. When one component's release PR merged first, sibling PRs kept an outdated version entry until release-please happened to resync, producing the recurring manifest merge conflict on this PR. A single combined release PR keeps one manifest in sync across all components. Co-authored-by: John R. Eakin <48845615+jreakin@users.noreply.github.com>
|
🤖 Created releases: 🌻 |
🤖 I have created a release beep boop
0.2.0 (2026-08-05)
Features
This PR was generated with Release Please. See documentation.