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.

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

Merge Conflict Resolution (from 5.5.x to 10.0.x) #681

Merged
merged 5 commits into from
Jan 2, 2024

Conversation

ConfluentJenkins
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

@ConfluentJenkins ConfluentJenkins requested a review from a team as a code owner January 2, 2024 06:49
Copy link

cla-assistant bot commented Jan 2, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ amitr17
❌ ConfluentJenkins
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link

cla-assistant bot commented Jan 2, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@ConfluentJenkins
Copy link
Contributor Author

passed

Analysis Details

0 Issues

  • Bug 0 Bugs
  • Vulnerability 0 Vulnerabilities
  • Code Smell 0 Code Smell

Coverage and Duplications

  • New Code Coverage : 0, Estimated coverage after merge : 71.7%
  • New Duplications : 0

Project ID: kafka-connect-hdfs
View in SonarQube

@amitr17 amitr17 merged commit 16aa68b into 10.0.x Jan 2, 2024
0 of 2 checks passed
@amitr17 amitr17 deleted the pr_merge_from_5_5_x_to_10_0_x branch January 2, 2024 07:51
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.

3 participants