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.

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

Jump to bottom

implement 3-way merge for workspace sync #42

Closed
mmoskal opened this issue May 12, 2016 · 2 comments
Closed

implement 3-way merge for workspace sync #42

mmoskal opened this issue May 12, 2016 · 2 comments
Labels
enhancement far out

Comments

@mmoskal
Copy link
Member

mmoskal commented May 12, 2016

Right now, we take the latest version. This may become more of an issue when we support cloud workspaces more widely.
@abchatra
Copy link
Contributor

This is too far out. If this is still valid let me know.

@mmoskal
Copy link
Member Author

mmoskal commented Sep 28, 2016

There is no cloud sync right now, so no problem. If we ever implement onedrive script/workspace storage, this may become needed.

@lock lock bot locked as resolved and limited conversation to collaborators Sep 28, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
enhancement far out
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@abchatra @mmoskal