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> |
||
|---|---|---|
| .. | ||
| onboarding | ||
| scripts | ||
| apply-dev-cert.sh | ||
| docker-start-proxy.ps1 | ||
| dotnet-devcert.crt | ||
| dotnet-devcert.pfx | ||
| localhost.conf | ||
| publish-proxy-logs.yml | ||
| target_version.txt | ||
| test-proxy-docker.yml | ||
| test-proxy-tool.yml | ||