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

Merged

George Ng (GeorgeNgMsft) merged 13 commits into

mainfrom

georgengmsft-merge-conflict-action

Sep 10, 2026

Commits on Sep 4, 2026

Add deterministic merge conflict actions

George Ng (GeorgeNgMsft)
and
Copilot
committed
41d9b27
Document merge state complexity

George Ng (GeorgeNgMsft)
and
Copilot
committed
c6e417e
Simplify merge conflict resolution

George Ng (GeorgeNgMsft)
and
Copilot
committed
f139298
Clarify merge destination branch

George Ng (GeorgeNgMsft)
and
Copilot
committed
a77c12b

Commits on Sep 5, 2026

Commits on Sep 9, 2026

Commits on Sep 10, 2026