Skip to content

feat(conflict): detect and resolve inline merge conflict markers #96

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
barrettruth merged 8 commits into from
Feb 8, 2026

fix(conflict): clear stale diagnostics before re-enabling

a192830
Select commit
Loading
Failed to load commit list.
Merged

feat(conflict): detect and resolve inline merge conflict markers #96

fix(conflict): clear stale diagnostics before re-enabling
a192830
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar