Edit conflicts [1] *should* occur only when you modify a tiddler that is different on the server. Is it possible you edited the same space in two different tabs/windows.
Since there was no highlighting going on I suspect there is a chance you have found a bug. Jon [1]http://docs.tiddlyspace.com/Edit%20Conflict On Apr 25, 7:25 pm, Yakov <[email protected]> wrote: > Wow. A very strange effect occured, you dig in the right direction, > Ben. When I saved edited ToolbarCommands, a message appeared in the > div id="tiddlerToolbarCommands": > > Edit Conflict: this tiddler may have been changed by someone else. > review (recommended) overwrite cancel > > and review sais: > > Review the changes that have been made whilst you were editing this > tiddler. Fold relevant changes back into your version. > {{removed{Red}}} highlight shows content removed. {{added{Green}}} > highlight shows content added. > > <<slider chkViewDiffText "ToolbarCommands - text *(edit conflict > 21:08:18)*" "View changes in text">> > <<slider chkViewDiffField "ToolbarCommands - fields *(edit conflict > 21:08:18)*" "View changes in fields">> > > The first slider shows the new text of ToolbarCommands (which I > defined): > > |~ViewToolbar|closeTiddler closeOthers +editTiddler +cloneTiddler > > fields syncing permalink references deleteTiddler| |~EditToolbar| > +saveTiddler -cancelTiddler deleteTiddler| > > (nothing is red or green as like as the words "Red" and "Green") and > the second shows some minor data: > > modifier: yakov created: 20110421193117 modified: 20110425170728 type: > None tags: _hash: c6c058d65feb35087569b44f6dc94b7fedd0a456 > > Now I choose "cancel" and changes are saved. Aha, that's right, now > the button "edit" appeared on those tiddlers which I couldn't edit > before. It is me who overwrote the ToolbarCommands content when > uploading interface elements. Now I've edited ToolbarCommands, saved, > reloaded, and every thing is ok. Thanks! -- You received this message because you are subscribed to the Google Groups "TiddlyWiki" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/tiddlywiki?hl=en.
