Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
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
This is currently an unused modal. Does not have diffing.