84f000c7c6
* 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> |
||
|---|---|---|
| .. | ||
| ApiView-Helpers.ps1 | ||
| CommandInvocation-Helpers.ps1 | ||
| DevOps-WorkItem-Helpers.ps1 | ||
| git-helpers.ps1 | ||
| git-helpers.tests.ps1 | ||
| Metadata-Helpers.ps1 | ||
| Package-Helpers.ps1 | ||
| PSModule-Helpers.ps1 | ||
| Resource-Helpers.ps1 | ||
| Service-Level-Readme-Automation-Helpers.ps1 | ||