Skip to content

test conflict workflow#140

Closed
liushilongbuaa wants to merge 0 commit intomasterfrom
feature1
Closed

test conflict workflow#140
liushilongbuaa wants to merge 0 commit intomasterfrom
feature1

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
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
…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
…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
liushilongbuaa pushed a commit that referenced this pull request Jan 2, 2025
…lly (sonic-net#15991)

#### Why I did it
src/sonic-gnmi
```
* 2c8e4ab - (HEAD -> master, origin/master, origin/HEAD) Support proto encoding (#140) (22 hours ago) [ganglv]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Jul 8, 2025
…utomatically (sonic-net#19551)

#### Why I did it
src/sonic-host-services
```
* aea0bef - (HEAD -> 202405, origin/202405) Ignore sonic_platform package fileNotFoundError on non-chassis vs platforms (#133) (#140) (4 minutes ago) [mssonicbld]
* 0e7e4d5 - Added support to render template format of `delayed` flag on Feature Table. (#135) (#137) (11 days ago) [mssonicbld]
* 235c2a4 - Fixed determine/process reboot-cause service dependency (sonic-net#17406) (#132) (13 days ago) [anamehra]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Mar 17, 2026
…ically (sonic-net#25512)

#### Why I did it
src/sonic-dash-ha
```
* d01ed94 - (HEAD -> master, origin/master, origin/HEAD) Add .github/copilot-instructions.md for AI-assisted development (#140) (7 hours ago) [rustiqly]
```
#### 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants