Modify

#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)

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

Download all attachments as: .zip

Change History (11)

comment:1 follow-up: Changed 13 months ago by skyper

  • Owner changed from team to anonymous
  • Status changed from new to needinfo

Are you talking about "trac" conflicts ?

comment:2 in reply to: ↑ 1 ; follow-up: 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

A data conflict is found on uploading.

Changed 13 months ago by BearT

The user tries to resolve the conflict.

Changed 13 months ago by BearT

The Resolve window opens up, showing the first page.

Changed 13 months ago by BearT

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

comment:4 follow-up: Changed 13 months ago by BearT

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 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:

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

Add Comment

Modify Ticket

Change Properties
<Author field>
Action
as closed .
as The resolution will be set. Next status will be 'closed'.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.