Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test conflict workflow #140

Closed
wants to merge 0 commits into from
Closed

test conflict workflow #140

wants to merge 0 commits into from

Conversation

liushilongbuaa
Copy link
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)

@liushilongbuaa liushilongbuaa reopened this Sep 5, 2023
@liushilongbuaa liushilongbuaa reopened this Sep 5, 2023
@liushilongbuaa liushilongbuaa reopened this Sep 5, 2023
@liushilongbuaa liushilongbuaa reopened this Sep 5, 2023
@liushilongbuaa liushilongbuaa reopened this Sep 5, 2023
@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

4 similar comments
@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@mssonicbld
Copy link
Collaborator

@liushilongbuaa PR: #140 is conflict with MS internal repo
Please complete the following PR by push fix commit to sonicbld/conflict_prefix/{PRID}-fix branch:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/8978695
Then comment on this page: '/azpw ms_conflict'

@mssonicbld
Copy link
Collaborator

@liushilongbuaa PR: #140 is conflict with MS internal repo
Please complete the following PR by push fix commit to sonicbld/conflict_prefix/{PRID}-fix branch:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/8978714
Then comment on this page: '/azpw ms_conflict'

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@mssonicbld
Copy link
Collaborator

@liushilongbuaa PR: #140 is conflict with MS internal repo
Please complete the following PR by push fix commit to sonicbld/conflict_prefix/{PRID}-fix branch:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/8978791
Then comment on this page: '/azpw ms_conflict'

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

liushilongbuaa pushed a commit that referenced this pull request Oct 27, 2023
@mssonicbld
[submodule] Update submodule sonic-restapi to the latest HEAD automat…
8b2d1b2 
…ically (sonic-net#15886)

src/sonic-restapi

* a69ba06 - (HEAD -> 202205, origin/master, origin/HEAD, origin/202205, master) [actions] Support Semgrep by Github Actions (#144) (3 weeks ago) [Mai Bui]
* 6b242a3 - [Ci] Upgrade python 2 to python 3 (#145) (3 weeks ago) [xumia]
* 1c50caa - prevent downcasting of 64-bit integer (#142) (2 months ago) [Mai Bui]
* de26989 - Use -race detector when building and testing (#141) (3 months ago) [Lawrence Lee]
* 9fe2eff - [go] Update Go to version 1.15 (#140) (3 months ago) [Lawrence Lee]
liushilongbuaa pushed a commit that referenced this pull request Jun 7, 2024
@mssonicbld
[submodule] Update submodule sonic-mgmt-common to the latest HEAD aut…
15e4976 
…omatically (sonic-net#19168)

#### Why I did it
src/sonic-mgmt-common
```
* 81bf799 - (HEAD -> master, origin/master, origin/HEAD) Adding subscription support for ethernet interfaces. (#140) (3 days ago) [Nikita Agarwal]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@liushilongbuaa @mssonicbld