19. merge
uDig Introduction 19
parks “first modification”
parks “first version”
parks “added a new feature”
parks “fix branch edits”fix
master parks “master edits
20. uDig Introduction 20
parks “first modification”
parks “first version”
parks “added a new feature”
parks “fix branch edits”fix
master
parks “master edits
parks “merge branch …
22. Q&A
•Q: Conflict based on?
Detected on primary key
Compare by attribute
•Q: How to show conflict?
Export to shp, or see demo …
•Q: Integration
Command Line, Java, GeoTools, GeoServer
HTTP, QGIS Plugin
23. Q&A
•Q: SSH
It is what git does, probably use SSL
•Q:Workflow recommendations?
Consider popular GIS Data Product workflows
Consider popular git workflows (branch/merge)
uDig Introduction 23