fix: apply strategic merge to workspace-preferences-configmap #725
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
fix: apply strategic merge to workspace-preferences-configmap
akurinnoy
requested review from
SDawley,
ibuziuk,
vinokurig and
tolusha
as code owners
artaleks9
approved these changes
Oct 4, 2024
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: akurinnoy, artaleks9 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Build 3.17 :: server_3.17/3: Console, Changes, Git Data |
|
Build 3.17 :: sync-to-downstream_3.17/32: Console, Changes, Git Data |
|
Build 3.17 :: push-latest-container-to-quay_3.17/24: Console, Changes, Git Data |
|
Build 3.17 :: get-sources-rhpkg-container-build_3.17/34: server : 3.17 :: Build 64795049 : quay.io/devspaces/server-rhel8:3.17-6 |
|
Build 3.17 :: server_3.17/3: Upstream sync done; /DS_CI/sync-to-downstream_3.17/32 triggered |
|
Build 3.17 :: update-digests_3.17/38: Console, Changes, Git Data |
|
Build 3.17 :: update-digests_3.17/38: No new images detected: nothing to do! |
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 does this PR do?
This is a cherry-pick of #723