Squash merge of: feature/tir-rm-dyn-data-add-helm-status, to avoid merging issues with master #154
Conversation
This file contains hidden or 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
jafarre-bi
approved these changes
Mar 20, 2025
BraisVQ
pushed a commit
that referenced
this pull request
Apr 10, 2025
BraisVQ
pushed a commit
that referenced
this pull request
Apr 29, 2025
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.
Same case as: opendevstack/ods-jenkins-shared-library#1206
Given that feature/tir-rm-dyn-data-add-helm-status branch is currently long-lived, directly PR squash-merging it into master is not an easy option.
This new mergefix/ branch has been created from the last commit on master, and on top of it, added a squashed commit with all the contents from feature/tir-rm-dyn-... branch.
This will make easier merging with master, given that only one extra (squashed) commit will be added to it.