* 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> |
||
|---|---|---|
| .. | ||
| common | ||
| docs/api/assets | ||
| pipelines | ||
| scripts | ||
| CredScanSuppression.json | ||
| ignore-links.txt | ||