Skip to content

Commit

Permalink
Fixed misleading text about conflict resolution on READ.ME
Browse files Browse the repository at this point in the history
  • Loading branch information
@scbtest
scbtest committed Dec 23, 2014
1 parent c22607a commit faf273c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ And in the middle of that change and a sync we have made local changes in sublim
We get a dialog asking what we want to do to resolve the conflict
![Alt Dialog](http://i.imgur.com/FUI0cFw.png "Dialog")

Selecting _Overwrite_ will discard the changes from the server and save what we have locally instead, we will be able to continue working with the note.
Selecting _Overwrite_ will discard overwrite the local changes with what the server has.

Selecting _Cancel_ instead will leave alone the local file, if you save after this the result will most likely be a merge performed by simplenote between the local data and the remote data.

Expand Down

0 comments on commit faf273c

Please sign in to comment.