•Q: Conflict based on?
Detected on primary key
Compare by attribute
•Q: How to show conflict?
Export to shp, or see demo …
Command Line, Java, GeoTools, GeoServer
HTTP, QGIS Plugin
It is what git does, probably use SSL
Consider popular GIS Data Product workflows
Consider popular git workflows (branch/merge)
uDig Introduction 23
A particular slide catching your eye?
Clipping is a handy way to collect important slides you want to go back to later.