From 2e1e662cb3f21a6a450c79dd662ad4d712dd0d81 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Thu, 4 Apr 2019 16:22:34 -0500 Subject: [PATCH] Suggest restarting app for sync resolution --- .../directives/sync-resolution-menu.html.haml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/templates/directives/sync-resolution-menu.html.haml b/app/assets/templates/directives/sync-resolution-menu.html.haml index 0ed9014c0..eaeb4469f 100644 --- a/app/assets/templates/directives/sync-resolution-menu.html.haml +++ b/app/assets/templates/directives/sync-resolution-menu.html.haml @@ -8,16 +8,20 @@ .sk-panel-section .sk-panel-row.sk-p 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-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. Be sure to download a backup of your data before doing so. .sk-p.sk-panel-row .sk-panel-column - %strong.sk-panel-row Option 2 — Sync Resolution: - .sk-p We can attempt to reconcile changes by downloading all data from the server. + %strong.sk-panel-row Option 3 — Sync Resolution: + .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, a conflicted copy will be created.