ROGUE-JCTD / salamati

Salamati is a web client based on OpenLayers that provides capabilities for editing features and interacting with GeoGit repositories
Other
6 stars 4 forks source link

Basic conflict resolution for merge and pull. #83

Closed kelseyishmael closed 11 years ago

kelseyishmael commented 11 years ago

Salamati needs a way to resolve conflicts through the UI. The first step of this is to be able to choose one entire feature over another.