Skip to content

Merging to release-5.12: Update pump an storage to support pgx v5 (#8094)#8097

Merged
buger merged 2 commits intorelease-5.12from
merge/release-5.12/dfbc83d3731c465da6fd2ecb4d109e4dce65d7b9
Apr 17, 2026
Merged

Merging to release-5.12: Update pump an storage to support pgx v5 (#8094)#8097
buger merged 2 commits intorelease-5.12from
merge/release-5.12/dfbc83d3731c465da6fd2ecb4d109e4dce65d7b9

Conversation

@probelabs
Copy link
Copy Markdown
Contributor

@probelabs probelabs bot commented Apr 17, 2026

Cherry-pick of dfbc83d3731c465da6fd2ecb4d109e4dce65d7b9 from release-5.12.1 to release-5.12 requires manual resolution.

Conflicts detected: 3

  • go.sum

Tips:

  • Check out this branch locally and run: git cherry-pick -x dfbc83d3731c465da6fd2ecb4d109e4dce65d7b9
  • Resolve conflicts (including submodules if any), then push back to this branch.

Original commit: dfbc83d

    Cherry-pick failed with conflicts and requires manual resolution.
    This empty commit exists to allow opening a draft PR.
@probelabs probelabs bot added the needs-manual-cherry-pick Cherry-pick has conflicts label Apr 17, 2026
@MFCaballero MFCaballero added the deps-reviewed Dependency changes reviewed and approved for CI execution label Apr 17, 2026
@MFCaballero MFCaballero marked this pull request as ready for review April 17, 2026 19:11
@buger buger merged commit 23156fc into release-5.12 Apr 17, 2026
35 of 52 checks passed
@buger buger deleted the merge/release-5.12/dfbc83d3731c465da6fd2ecb4d109e4dce65d7b9 branch April 17, 2026 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deps-reviewed Dependency changes reviewed and approved for CI execution needs-manual-cherry-pick Cherry-pick has conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants