Skip to content

Allow file syncing during conflict resolution #595

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
huntercaron wants to merge 11 commits into
base: main
Choose a base branch
from

Merge origin/main into huntercaron/sync-during-conflict

df82c7d
Select commit
Loading
Failed to load commit list.
Open

Allow file syncing during conflict resolution #595

Merge origin/main into huntercaron/sync-during-conflict
df82c7d
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar