Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve handling of conflicts during merge #7

Open
liberostelios opened this issue Mar 1, 2020 · 0 comments
Open

Improve handling of conflicts during merge #7

liberostelios opened this issue Mar 1, 2020 · 0 comments

Comments

@liberostelios
Copy link
Contributor

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@liberostelios