Skip to content

Merge Conflict Resolution (from 8.0.x to 8.1.x)#937

Open
semaphore-agent-reader[bot] wants to merge 2 commits into8.1.xfrom
pr_merge_from_8_0_x_to_8_1_x
Open

Merge Conflict Resolution (from 8.0.x to 8.1.x)#937
semaphore-agent-reader[bot] wants to merge 2 commits into8.1.xfrom
pr_merge_from_8_0_x_to_8_1_x

Conversation

@semaphore-agent-reader
Copy link

What is this pull request?

This is an autogenerated pull request by pint due to a merge conflict failure seen during pint merge.

Next Steps

  1. Resolve all conflicts (either via web editor or the command line)
  2. Commit merge
  3. Obtain approvals from reviewers
  4. (IMPORTANT) After obtaining approvals, click the dropdown menu on the merge button and select "Create a merge commit"
  5. Click the "Merge pull request" button
  6. Re-run pint merge

NOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.

Questions?

Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall

Na Lou (nlou9) and others added 2 commits March 20, 2026 16:33
Align dependency versions in common-parent with ce-kafka 8.0.x bumps
(ce-kafka PRs #29320 and #29293):

- classgraph: 4.8.138 -> 4.8.179
- easymock: 5.2.0 -> 5.6.0
- snappy-java: 1.1.10.5 -> 1.1.10.7

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
[BOM] Bump classgraph, easymock, snappy-java on 8.0.x
@semaphore-agent-reader semaphore-agent-reader bot requested review from a team as code owners March 23, 2026 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants