Mercurial > hg > ConflictEditor
diff src/site/twiki/index.twiki @ 41:0c36e54a85b5
add a site
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 10 Oct 2011 02:56:36 +0200 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/site/twiki/index.twiki Mon Oct 10 02:56:36 2011 +0200 @@ -0,0 +1,8 @@ +---+ An editor for couchdb conflicts + +<img src="images/Screenshot.png"/> + +This is an editor for couchdb conflicts. Point it at a couchdb database and it will list all documents that contain conflicts. When you select a conflict from the list, the conflicting attributes will be displayed. Use the buttons at the bottom of the window to choose between the value from the original or the value from the conflict. Press the save button to resolve the conflict. + +---+ Run it! +<a href="launch.jnlp">Run it</a> right now via Java Web Start. \ No newline at end of file