Skip to content

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
Merged

Add "Resolve Script Conflicts" action + merge panel to the Vortex extension#21
TheValiantOne merged 3 commits into
mainfrom
feature/vortex-resolve-conflicts-action

Merge main into Unit H's branch, resolving conflicts with Unit I

38d92e0
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar