rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suggest restarting app for sync resolution

Browse Source
This commit is contained in:
Mo Bitar
2019-04-04 16:22:34 -05:00
parent 5d949d5200
commit 2e1e662cb3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/templates/directives/sync-resolution-menu.html.haml
View File

@@ -8,16 +8,20 @@
.sk-panel-section .sk-panel-section
.sk-panel-row.sk-p .sk-panel-row.sk-p
We've detected that the data on the server may not match the data in the current application session. We've detected that the data on the server may not match the data in the current application session.
.sk-p.sk-panel-row .sk-p.sk-panel-row
.sk-panel-column .sk-panel-column
%strong.sk-panel-row Option 1 (recommended) — Sign Out: %strong.sk-panel-row Option 1 — Restart App:
.sk-p Quit the application and re-open it. Sometimes, this may resolve the issue.
.sk-p.sk-panel-row
.sk-panel-column
%strong.sk-panel-row Option 2 (recommended) — Sign Out:
.sk-p Sign out of your account, then sign back in. This will ensure your data is consistent with the server. .sk-p Sign out of your account, then sign back in. This will ensure your data is consistent with the server.
Be sure to download a backup of your data before doing so. Be sure to download a backup of your data before doing so.
.sk-p.sk-panel-row .sk-p.sk-panel-row
.sk-panel-column .sk-panel-column
%strong.sk-panel-row Option 2 — Sync Resolution: %strong.sk-panel-row Option 3 — Sync Resolution:
.sk-p We can attempt to reconcile changes by downloading all data from the server. .sk-p
We can attempt to reconcile changes by downloading all data from the server.
No existing data will be overwritten. If the local contents of an item differ from what the server has, No existing data will be overwritten. If the local contents of an item differ from what the server has,
a conflicted copy will be created. a conflicted copy will be created.