Opened 11 years ago

Closed 11 years ago

#1037 closed enhancement (fixed)

"Resolve conflicts first" - but how?

Reported by: Colin Marquardt Owned by: bvh-osm@…
Priority: minor Milestone:
Component: merkaartor Version:
Keywords: Cc:

Description

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.

Change History (1)

comment:1 Changed 11 years ago by Chris Browet

Resolution: fixed
Status: newclosed

(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

Note: See TracTickets for help on using tickets.