[staticroutebfd] double commit for PR 15765#17971
Closed
baorliu wants to merge 1 commit intosonic-net:202305from
Closed
[staticroutebfd] double commit for PR 15765#17971baorliu wants to merge 1 commit intosonic-net:202305from
baorliu wants to merge 1 commit intosonic-net:202305from
Conversation
Contributor
|
@baorliu please resolve the conflict. |
Contributor
Author
let me fix it. I updated my forked repo before create PR, not sure why it has conflict... |
Contributor
Author
|
the base branch behind too much, create another PR and close the current one. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Why I did it
Double commit to 202305 for PR 15765, because of cherry-pick failure.
#15765
Work item tracking
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)