Merges local changes with server changes (if any) before syncing with server