Mercurial > hg > ConflictEditor

annotate src/site/twiki/index.twiki @ 41:0c36e54a85b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a site
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 10 Oct 2011 02:56:36 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
41
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
1 ---+ An editor for couchdb conflicts
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
2
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
3 <img src="images/Screenshot.png"/>
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
4
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
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.
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
6
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
7 ---+ Run it!
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
8 <a href="launch.jnlp">Run it</a> right now via Java Web Start.