Avoid merge conflicts during upgrades #70
Merged
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
markgoddard
commented
Sep 2, 2024
markgoddard
commented
- Upgrade: show stashed changes when git stash pop fails
- Make adding internal TLS config to globals.yml idempotent
We may end up with merge conflicts in upgrade jobs.
Previously the internal TLS config in globals-tls-config.yml was always appended to Kolla Ansible's globals.yml. This could result in duplicated variables. This change only appends the config when it is not already present in globals.yml. This also makes it possible to add the internal TLS config permanently within globals.yml, behind a conditional.
Alex-Welsh
approved these changes
Sep 6, 2024
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.