Add "Resolve Script Conflicts" action + merge panel to the Vortex extension - #21

Merged

TheValiantOne merged 3 commits into

mainfrom

feature/vortex-resolve-conflicts-action

Aug 11, 2026

Commits on Aug 10, 2026

Add "Resolve Script Conflicts" action and merge panel to the Vortex extension.
authored and
Chris Knight
committed
d4cd98b
Merge main into Unit H's branch, resolving conflicts with Unit G
authored and
Chris Knight
committed
dc5c24c

Commits on Aug 11, 2026

Merge main into Unit H's branch, resolving conflicts with Unit I
authored and
Chris Knight
committed
38d92e0