Fix/merge conflict staging resolution #4917
Merged
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: migrate state to new backend * fix: staging state migration + fixes --------- Co-authored-by: Rahul Sethuram <rahul.eth@icloud.com>
* fix: prod state migrations * fix: missing config
* fix: remove ci stop check * fix: remove continue-on-error
* fix: bump tf version and fix warning * fix: terraform version bump
carlomazzaferro
requested review from
preethamr and
rhlsthrm
as code owners
preethamr
approved these changes
Sep 19, 2023
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.
Description
Type of change
High-level change(s) description - from the user's perspective
Related Issue(s)
Fixes
Related pull request(s)