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 7.5.x to 7.6.x) #3493

Open
wants to merge 8 commits into
base: 7.6.x
Choose a base branch
from

Conversation

semaphore-agent-production[bot]
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

@semaphore-agent-production semaphore-agent-production bot requested a review from a team as a code owner December 21, 2024 00:54
@sonarqube-confluent

This comment has been minimized.

@airlock-confluentinc airlock-confluentinc bot force-pushed the pr_merge_from_7_5_x_to_7_6_x branch from fb1ce7e to 4a4ee4e Compare December 23, 2024 15:49
@sonarqube-confluent

This comment has been minimized.

@airlock-confluentinc airlock-confluentinc bot force-pushed the pr_merge_from_7_5_x_to_7_6_x branch from 4a4ee4e to 47129ab Compare December 23, 2024 16:18
@sonarqube-confluent

This comment has been minimized.

4 similar comments
@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

1 similar comment
@sonarqube-confluent

This comment has been minimized.

@airlock-confluentinc airlock-confluentinc bot force-pushed the pr_merge_from_7_5_x_to_7_6_x branch from a2badd9 to 13d494b Compare December 24, 2024 02:45
@airlock-confluentinc airlock-confluentinc bot force-pushed the pr_merge_from_7_5_x_to_7_6_x branch from b996d64 to 7f75e15 Compare December 24, 2024 03:29
@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent

This comment has been minimized.

@sonarqube-confluent
Copy link

Failed

  • 67.80% Coverage on New Code (is less than 80.00%)

Analysis Details

2908 Issues

  • Bug 72 Bugs
  • Vulnerability 15 Vulnerabilities
  • Code Smell 2821 Code Smells

Coverage and Duplications

  • Coverage 67.80% Coverage (67.60% Estimated after merge)
  • Duplications No duplication information (2.30% Estimated after merge)

Project ID: schema-registry

View in SonarQube

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.

1 participant