Opened 13 months ago
Closed 11 months ago
#7601 closed enhancement (fixed)
Conflicts dialog should be opened at the first page showing a conflict
| Reported by: | anonymous | Owned by: | team |
|---|---|---|---|
| Priority: | normal | Component: | Core |
| Version: | latest | Keywords: | conflict resolution |
| Cc: |
Description
When there is a conflict and one opens the Merge Conflict window by double-clicking the conflict the window always opens on the first page (ie. the property page) even if the conflict is visible on any of the following pages.
It would be nice to open the window on the first page showing a conflict (ie. it has a red square next to its name) to prevent some unnecessary reading and clicking.
Attachments (4)
Change History (11)
comment:1 follow-up: ↓ 2 Changed 13 months ago by skyper
- Owner changed from team to anonymous
- Status changed from new to needinfo
comment:2 in reply to: ↑ 1 ; follow-up: ↓ 3 Changed 13 months ago by anonymous
Replying to skyper:
Are you talking about "trac" conflicts ?
Nope. When I upload in JOSM and some data has been changed on the server in the meantime. That's the conflict I'm talking about.
comment:3 in reply to: ↑ 2 Changed 13 months ago by skyper
Replying to anonymous:
Replying to skyper:
Are you talking about "trac" conflicts ?
Nope. When I upload in JOSM and some data has been changed on the server in the meantime. That's the conflict I'm talking about.
Still do not understand. What pages are you talking about ? Do you use a dual/multi-screen setup ?
Could you please add a step by step description and a screenshot if possible.
Thanks
Changed 13 months ago by BearT
This page should actually be opened directly when opening the Resolve window.
comment:4 follow-up: ↓ 6 Changed 13 months ago by BearT
So here's the step by step description with some screenshots.
- The user uploads some data and JOSM reports a data conflict between the OSM server data and the data JOSM has downloaded previously.
- The user tries to resolve the conflict by doubleclicking the conflicting (in this case) way in the Conflicts subwindow.
- The Resolve conflicts window opens, but it opens on the first page, the Properties page, where no conflict occurs.
- The user has to open the Tags page, where the conflict can be fixed.
I think the dialog should open with the (in this case) Tags page opened, ie. the first page that actually shows a conflict.
comment:5 Changed 13 months ago by BearT
- Owner changed from anonymous to BearT
comment:6 in reply to: ↑ 4 Changed 13 months ago by skyper
- Keywords conflict resolution added
- Owner changed from BearT to team
- Status changed from needinfo to new
Replying to BearT:
So here's the step by step description with some screenshots.
Thanks, now I got it.
comment:7 Changed 11 months ago by Don-vip
- Resolution set to fixed
- Status changed from new to closed
In 5288/josm:



Are you talking about "trac" conflicts ?