Skip to content
This repository has been archived by the owner on Jul 24, 2021. It is now read-only.

"Resolve conflicts first" - but how? #1037

Closed
openstreetmap-trac opened this issue Jul 23, 2021 · 1 comment
Closed

"Resolve conflicts first" - but how? #1037

openstreetmap-trac opened this issue Jul 23, 2021 · 1 comment
Assignees
@openstreetmap-trac
Labels
Component: merkaartor Priority: minor Resolution: fixed Type: enhancement

Comments

@openstreetmap-trac
Copy link

Reporter: ColinMarquardt
[Submitted to the original trac issue database at 4.27pm, Sunday, 13th July 2008]

I now had a case where Merkaartor told me I need to resolve conflicts before uploading. I was struggling how to do that though. I disabled all layers except the Conflicts layer and found one node there, but nothing obviously wrong with it (IIRC I had moved it a bit before, and added a tag to it). I just deleted that node then, but Merkaartor still wouldn't let me upload. I then saved to an MDC file, and loaded it into a fresh Merkaartor, which then didn't mind about conflicts anymore.

The "conflicts" dialog should give a little hint about how the resolution process is to be done.
@openstreetmap-trac openstreetmap-trac self-assigned this Jul 23, 2021
@openstreetmap-trac
Copy link
Author

Author: koying
[Added to the original trac issue at 12.06pm, Thursday, 17th July 2008]

(In [9118]) FIX : temporary fix for conflict management. Will need more thinking... (fixes #1037, #1041)
FIX : handle layer zoom with 0 features or 1 trackpoint properly

@openstreetmap-trac openstreetmap-trac mentioned this issue Jul 23, 2021
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@openstreetmap-trac openstreetmap-trac

Labels
Component: merkaartor Priority: minor Resolution: fixed Type: enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@openstreetmap-trac