Skip to content

conflict#145

Closed
liushilongbuaa wants to merge 1 commit into202211from
feature
Closed

conflict#145
liushilongbuaa wants to merge 1 commit into202211from
feature

Conversation

@liushilongbuaa
Copy link
Copy Markdown
Owner

Why I did it

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

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)

@mssonicbld
Copy link
Copy Markdown
Collaborator

@liushilongbuaa PR: #145 is conflict with MS internal repo
Please resolve conflict and complete the following PR, and then rerun MSConflictDetect workflow:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/8765704

@mssonicbld
Copy link
Copy Markdown
Collaborator

@liushilongbuaa PR: #145 is conflict with MS internal repo
Please resolve conflict and complete the following PR, and then rerun MSConflictDetect workflow:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/8926464

Repository owner deleted a comment from mssonicbld Oct 19, 2023
Repository owner deleted a comment from mssonicbld Oct 19, 2023
@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw run ms_conflict

@mssonicbld
Copy link
Copy Markdown
Collaborator

/AzurePipelines run ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

24 similar comments
@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict1

@liushilongbuaa
Copy link
Copy Markdown
Owner Author

/azpw ms_conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants