Skip to content

feat: support for conflict resolution / merging#2

Merged
Michael Thomas (michaelhthomas) merged 21 commits into
mainfrom
merge
May 12, 2026
Merged

feat: support for conflict resolution / merging#2
Michael Thomas (michaelhthomas) merged 21 commits into
mainfrom
merge

refactor: represent conflicts using discriminated union, support for

2917b57
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar