Skip to content

conflicts: add conflict labels to MergedTree and store in backends #7850

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+792 −168

protos: add conflict labels to working copy and simple backend

e1dea15
Select commit
Loading
Failed to load commit list.
Open

conflicts: add conflict labels to MergedTree and store in backends #7850

protos: add conflict labels to working copy and simple backend
e1dea15
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar