Skip to content

conflict support 3 - add merge-editor conflict actions, stateful result rendering and reopen-safe persistence #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
polyphilz merged 2 commits into from
Apr 27, 2026

trigger ci again

ce9fdcd
Select commit
Loading
Failed to load commit list.
Merged

conflict support 3 - add merge-editor conflict actions, stateful result rendering and reopen-safe persistence #4

trigger ci again
ce9fdcd
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar