* 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> |
||
|---|---|---|
| .. | ||
| docgeneration | ||
| pipelines | ||
| scripts | ||
| spelling | ||
| testproxy | ||
| TestResources | ||
| InterdependencyGraph.html | ||
| README.md | ||
Common Engineering System
Updates under this directory should only be made in the azure-sdk-tools repo as any changes under this directory outside of that repo will end up getting overwritten with future updates. For information about making updates see common engineering system docs