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

[iOS] [Feature request] Highlight differences during Conflicted Copy errors #750

Open
yingw787 opened this issue Nov 4, 2019 · 1 comment

Comments

@yingw787
Copy link

@yingw787 yingw787 commented Nov 4, 2019

Hello!

My Internet is extremely spotty sometimes and I've been getting Conflicted Copy errors quite frequently. One thing that might help me resolve Conflicted Copy errors better is highlighting where the conflict occurs. Is there a merge conflict underlying view that can be exposed to dev/canary users by any chance? Sometimes my notes are quite large and finding the differences takes a while and correct resolution may have low confidence; this would be a big help on my end. If you think this is a small issue and you are open to a PR, some pointers to where I could look first would be really helpful too. Thanks for your help, and please let me know if there is more information you need me to submit.

iOS Standard Notes version: 3.0.16
iOS Version: 13.1.3
iPhone Version: iPhone 7 (Model MN8N2LL/A)

Ying

@mobitar mobitar transferred this issue from standardnotes/desktop Nov 4, 2019
@mobitar

This comment has been minimized.

Copy link
Member

@mobitar mobitar commented Nov 4, 2019

This would be nice to have. Definitely not a small issue though. We'd need client-side JavaScript-based diffing. One place to start is here: https://github.com/standardnotes/web/blob/master/app/assets/javascripts/app/directives/views/conflictResolutionModal.js

This is currently an unused modal. Does not have diffing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.