Skip to content
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.

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

Merge/Update from conflict files #243

Open
perry-mitchell opened this issue Dec 14, 2018 · 0 comments
Open

Merge/Update from conflict files #243

perry-mitchell opened this issue Dec 14, 2018 · 0 comments

Comments

@perry-mitchell
Copy link
Member

Support for merging conflict files which sometimes appear on various cloud storage platforms.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant