2 Commits

Author	SHA1	Message	Date
Azure SDK Bot	2973916598	Sync eng/common directory with azure-sdk-tools for PR 10134 (#6489) ... * Move functions to git-helpers and resolve review to approval script * Add approval script details to sync workflow doc * Fix up warnings/unused variables * Formatting * Add re-approval logic --------- Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>	2025-03-31 16:56:44 -07:00
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