A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
global: clarify explanations for force push and force pull (#6255)
François Martin3880db4339dc
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsxindex e909c100c..ffd5b3748 100644--- a/apps/mobile/app/screens/settings/settings-data.tsx+++ b/apps/mobile/app/screens/settings/settings-data.tsx@@ -475,7 +475,7 @@ export const settingsGroups: SettingSection[] = [{id: "pull-sync",name: "Force pull changes",- description: `Use this if some changes are not appearing on this device from other devices. This will pull everything from the server and overwrite with whatever is one this device.\n\nThese must only be used for troubleshooting. Using them regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at [email protected].`,+ description: `Use this if changes from other devices are not appearing on this device. This will overwrite the data on this device with the latest data from the server.\n\nThis must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at [email protected].`,modifer: () => {presentDialog({title: "Force Pull changes",@@ -497,7 +497,7 @@ export const settingsGroups: SettingSection[] = [{id: "push-sync",name: "Force push changes",- description: `Use this if some changes are not appearing on this device from other devices. This will pull everything from the server and overwrite with whatever is one this device.`,+ description: `Use this if changes made on this device are not appearing on other devices. This will overwrite the data on the server with the data from this device.\n\nThis must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at [email protected].`,modifer: () => {presentDialog({title: "Force Push changes",diff --git a/apps/web/src/dialogs/settings/sync-settings.ts b/apps/web/src/dialogs/settings/sync-settings.tsindex 369f712d5..9e1acc484 100644--- a/apps/web/src/dialogs/settings/sync-settings.ts+++ b/apps/web/src/dialogs/settings/sync-settings.ts@@ -80,10 +80,10 @@ export const SyncSettings: SettingsGroup[] = [key: "force-sync",title: "Having problems with sync?",description: `Force push:-Use this if some changes from this device are not appearing on other devices.This will push everything on this device and overwrite whatever is one the server.+Use this if changes made on this device are not appearing on other devices. This will overwrite the data on the server with the data from this device.Force pull:-Use this if some changes are not appearing on this device from other devices. This will pull everything from the server and overwrite with whatever is one this device.+Use this if changes from other devices are not appearing on this device. This will overwrite the data on this device with the latest data from the server.**These must only be used for troubleshooting. Using them regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at [email protected].**`,keywords: ["force sync", "sync troubleshoot"],