Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Conflict Resolution (from 10.2.x to master) #706

Merged
merged 3 commits into from
Oct 23, 2024
Merged

Merge Conflict Resolution (from 10.2.x to master) #706

merged 3 commits into from
Oct 23, 2024

Conversation

ConfluentSemaphore
Copy link
Contributor

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

@ConfluentSemaphore ConfluentSemaphore requested a review from a team as a code owner October 23, 2024 10:22
@vbalani002 vbalani002 merged commit 5ead18e into master Oct 23, 2024
1 of 2 checks passed
@vbalani002 vbalani002 deleted the pr_merge_from_10_2_x_to_master branch October 23, 2024 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbalani002 vbalani002 vbalani002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ConfluentSemaphore @vbalani002