github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
84f000c7c6
azure-sdk-for-cpp/eng/common/testproxy/scripts
History
Azure SDK Bot 84f000c7c6
Sync eng/common directory with azure-sdk-tools for PR 7537 (#5278) 
* Add ConflictedFile to git-helpers.ps1, add git-helpers.tests.ps1 to exercise basic functionality.
* Add `resolve-asset-conflict.ps1` a script that can autoresolve an assets.json file.

---------

Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
Co-authored-by: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
2024-01-17 14:08:35 -08:00
..
resolve-asset-conflict Sync eng/common directory with azure-sdk-tools for PR 7537 (#5278) 2024-01-17 14:08:35 -08:00
tag-merge Sync eng/common directory with azure-sdk-tools for PR 7537 (#5278) 2024-01-17 14:08:35 -08:00
override-proxy-version.ps1 Sync eng/common directory with azure-sdk-tools for PR 7385 (#5223) 2023-12-06 15:18:40 -08:00