Code

auto-merge conflicted assets.json#7537

Code

Merged

scbedd merged 10 commits intomainAzure/azure-sdk-tools:mainfrom autoresolve-asset-conflictAzure/azure-sdk-tools:autoresolve-asset-conflictCopy head branch name to clipboardJan 17, 2024

+297-23

Commits

Commits on Jan 12, 2024

• updating to create the structure of the new script

  scbedd

  committed
  60d8767

  Copy full SHA for 60d8767

Commits on Jan 16, 2024

• basic shape of the differ is done. need to understand why this function isn't actually calling the constructor

  scbedd

  committed
  15b015a

  Copy full SHA for 15b015a

• 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

  committed
  730d6fa

  Copy full SHA for 730d6fa

• add some clarity via comment as to why certain choices were made

  scbedd

  committed
  eb2515f

  Copy full SHA for eb2515f

• having issues with formatting, so removing the problem

  scbedd

  committed
  f8291e0

  Copy full SHA for f8291e0

Commits on Jan 17, 2024

• properly get the content of the left and ride side versions of the file

  scbedd

  committed
  e8ce4a4

  Copy full SHA for e8ce4a4

• basic resolution should be working now

  scbedd

  committed
  f6394b2

  Copy full SHA for f6394b2

• basic auto-merge resolution is definitely working

  scbedd

  committed
  2f8aeb4

  Copy full SHA for 2f8aeb4

• updating the error resolution side

  scbedd

  committed
  b4a390b

  Copy full SHA for b4a390b

• Update eng/common/scripts/Helpers/git-helpers.ps1

  Show description for 845b9c6
  

  scbedd

  and

  benbp

  authored
  845b9c6

  Copy full SHA for 845b9c6