[#86] Sync → Refuse to overwrite local edits made mid sync#111

revett merged 2 commits into

main8thpark/geode:mainfrom

revett/fix/868thpark/geode:revett/fix/86Copy head branch name to clipboard