Sync eng/common directory with azure-sdk-tools for PR 7537#5278

Merged

scbedd merged 10 commits intomainfrom

sync-eng/common-autoresolve-asset-conflict-7537

Jan 17, 2024

Commits on Jan 17, 2024

updating to create the structure of the new script

scbedd
authored and
azure-sdk
committed
basic shape of the differ is done. need to understand why this function isn't actually calling the constructor

scbedd
authored and
azure-sdk
committed
now we are properly getting a result out of git show. the problem is we're destroying the newlines. gotta be a better way to get the results

scbedd
authored and
azure-sdk
committed
add some clarity via comment as to why certain choices were made

scbedd
authored and
azure-sdk
committed
having issues with formatting, so removing the problem

scbedd
authored and
azure-sdk
committed
properly get the content of the left and ride side versions of the file

scbedd
authored and
azure-sdk
committed
basic resolution should be working now

scbedd
authored and
azure-sdk
committed
basic auto-merge resolution is definitely working

scbedd
authored and
azure-sdk
committed
updating the error resolution side

scbedd
authored and
azure-sdk
committed
Update eng/common/scripts/Helpers/git-helpers.ps1

authored and
azure-sdk
committed