Skip to content

[Github Agent] Add merge conflict resolution action - #2975

Draft
George Ng (GeorgeNgMsft) wants to merge 9 commits into
mainfrom
georgengmsft-merge-conflict-action
Draft

[Github Agent] Add merge conflict resolution action#2975
George Ng (GeorgeNgMsft) wants to merge 9 commits into
mainfrom
georgengmsft-merge-conflict-action

Merge branch 'main' into georgengmsft-merge-conflict-action

df7dbf6
Select commit
Loading
Failed to load commit list.
Azure Pipelines / TypeAgent Smoke Tests (Detect ts changes) succeeded Sep 5, 2026 in 26s

Detect ts changes succeeded

0 errors / 0 warnings

View more details on Azure Pipelines