fix: relax the case for last applied annotation is removed #353
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
ryanzhang-oss
changed the title
michaelawyu
reviewed
Jan 13, 2023
ryanzhang-oss
force-pushed
the
fix-missing-applied
branch
from
98dd049 to
beff14e
Compare
ryanzhang-oss
force-pushed
the
fix-missing-applied
branch
from
f1cae7f to
1cc5031
Compare
zhiying-lin
reviewed
Jan 13, 2023
zhiying-lin
reviewed
Jan 13, 2023
zhiying-lin
previously approved these changes
Jan 13, 2023
Co-authored-by: Zhiying Lin <[email protected]>
zhiying-lin
approved these changes
Jan 16, 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 of your changes
Do not return an error if someone removes the last applied annotation in the applied resources. The three way merge lib can handle this case.
Fixes # 349
I have:
make reviewableto ensure this PR is ready for review.How has this code been tested
IT
Special notes for your reviewer