Improve handling of conflicts during merge

tudelft3d / cityjson-versioning-prototype

A prototype implementation of interaction with versioned CityJSON files

MIT License

5 stars 1 forks source link

Improve handling of conflicts during merge #7

Open liberostelios opened 4 years ago

liberostelios commented 4 years ago

Currently, during merge every pair of changes on the same city object is considered a conflict. It should be possible that changes on the same object are resolved automatically, as soon as they don't change the same attribute/geometry.