-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
semaphore-agent-production
wants to merge
8
commits into
7.6.x
Choose a base branch
from
pr_merge_from_7_5_x_to_7_6_x
base: 7.6.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+12,366
−12,039
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
semaphore-agent-production
bot
requested a review
from a team
as a code owner
December 21, 2024 00:54
This comment has been minimized.
This comment has been minimized.
airlock-confluentinc
bot
force-pushed
the
pr_merge_from_7_5_x_to_7_6_x
branch
from
December 23, 2024 15:49
fb1ce7e
to
4a4ee4e
Compare
This comment has been minimized.
This comment has been minimized.
airlock-confluentinc
bot
force-pushed
the
pr_merge_from_7_5_x_to_7_6_x
branch
from
December 23, 2024 16:18
4a4ee4e
to
47129ab
Compare
This comment has been minimized.
This comment has been minimized.
4 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
1 similar comment
This comment has been minimized.
This comment has been minimized.
airlock-confluentinc
bot
force-pushed
the
pr_merge_from_7_5_x_to_7_6_x
branch
from
December 24, 2024 02:45
a2badd9
to
13d494b
Compare
airlock-confluentinc
bot
force-pushed
the
pr_merge_from_7_5_x_to_7_6_x
branch
from
December 24, 2024 03:29
b996d64
to
7f75e15
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this pull request?
This is an autogenerated pull request by
pint
due to a merge conflict failure seen duringpint merge
.Next Steps
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