Mercurial > hg > ConflictEditor
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 40:fd71a5d17fd9 | 41:0c36e54a85b5 |
|---|---|
| 1 ---+ An editor for couchdb conflicts | |
| 2 | |
| 3 <img src="images/Screenshot.png"/> | |
| 4 | |
| 5 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. | |
| 6 | |
| 7 ---+ Run it! | |
| 8 <a href="launch.jnlp">Run it</a> right now via Java Web Start. |