Modify

Opened 12 years ago

Closed 12 years 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 Milestone:
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)

ConflictFound.png (33.3 KB ) - added by BearT 12 years ago.
A data conflict is found on uploading.
StartResolving.png (19.8 KB ) - added by BearT 12 years ago.
The user tries to resolve the conflict.
ResolveWindowShows.png (49.9 KB ) - added by BearT 12 years ago.
The Resolve window opens up, showing the first page.
ResolveWindowShouldShow.png (45.0 KB ) - added by BearT 12 years ago.
This page should actually be opened directly when opening the Resolve window.

Download all attachments as: .zip

Change History (11)

comment:1 by skyper, 12 years ago

Owner: changed from team to anonymous
Status: newneedinfo

Are you talking about "trac" conflicts ?

in reply to:  1 ; comment:2 by anonymous, 12 years ago

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.

in reply to:  2 comment:3 by skyper, 12 years ago

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

by BearT, 12 years ago

Attachment: ConflictFound.png added

A data conflict is found on uploading.

by BearT, 12 years ago

Attachment: StartResolving.png added

The user tries to resolve the conflict.

by BearT, 12 years ago

Attachment: ResolveWindowShows.png added

The Resolve window opens up, showing the first page.

by BearT, 12 years ago

Attachment: ResolveWindowShouldShow.png added

This page should actually be opened directly when opening the Resolve window.

comment:4 by BearT, 12 years ago

So here's the step by step description with some screenshots.

  1. The user uploads some data and JOSM reports a data conflict between the OSM server data and the data JOSM has downloaded previously. A data conflict is found on uploading.
  2. The user tries to resolve the conflict by doubleclicking the conflicting (in this case) way in the Conflicts subwindow. The user tries to resolve the conflict.
  3. The Resolve conflicts window opens, but it opens on the first page, the Properties page, where no conflict occurs. The Resolve window opens up, showing the first page.
  4. The user has to open the Tags page, where the conflict can be fixed. This page should actually be opened directly when opening the Resolve window.

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 by BearT, 12 years ago

Owner: changed from anonymous to BearT

in reply to:  4 comment:6 by skyper, 12 years ago

Keywords: conflict resolution added
Owner: changed from BearT to team
Status: needinfonew

Replying to BearT:

So here's the step by step description with some screenshots.

Thanks, now I got it.

comment:7 by Don-vip, 12 years ago

Resolution: fixed
Status: newclosed

In 5288/josm:

fix #7601 - Conflicts dialog is now opened at the first tab showing a conflict

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.