Messaging/UX for remote changes #221
Description
When a user is editing a file currently it will always override the remote version. There is an issue for erroring when the remote file has changed.
The UX needs to be determined for how this will be displayed to the user.
There are a couple of points to this:
- We can pull the latest version of the file and update the 'original' data for the editor.
- This should handle most cases as it will keep the user's changes.
- The cases when it fails it can be pretty drastic. For example, if the length of a list changes in the remote change the local changes can overwrite the remote data.
- For the UX we have several options we could use:
- Reset to the latest version of the file (lose changes).
- Try to merge changes cleanly (do some deep data checking to see if there are things that will not merge cleanly like list length changes) This is not a fool-proof merge since some scenarios will cause this to fail (ex: remove a list item, add a new one -- the length of the list doesn't change and we don't know if the list items are equivalent).
- Overwrite remote changes (Probably don't want this option?)
- [Long term] Provide a diff between what the merged changes would do vs the remote value.