how to best revert documentation #550
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
cameroncaci
requested review from
deandreJones,
danieljordan-caci,
TevinAdams and
traskowskycaci
deandreJones
approved these changes
Dec 9, 2024
docs/tools/github/Reverting-in-main-with-an-integration-branch.md
Outdated
Show resolved
Hide resolved
traskowskycaci
approved these changes
Dec 10, 2024
danieljordan-caci
approved these changes
Dec 10, 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.
Given recent reverts to main and main locks, this outlines the best way to reduce conflicts with reverting from main when no feature flags are able to be utilized.