Skip to content

feat: add block-level LWW for fine-grained text conflict resolution #13

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
andinux merged 5 commits into from
Mar 13, 2026

fix(ci): install git in Alpine container before checkout

5b7f67a
Select commit
Loading
Failed to load commit list.
Merged

feat: add block-level LWW for fine-grained text conflict resolution #13

fix(ci): install git in Alpine container before checkout
5b7f67a
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar