Modify

Opened 4 years ago

Closed 4 years ago

#12338 closed enhancement (fixed)

allow for quicker conflict resolution

Reported by: dieterdreist Owned by: team
Priority: normal Milestone: 16.02
Component: Core Version:
Keywords: conflict, resolution Cc:

Description

It would be great to be able to add an additional option in conflict resolution: one button to discard all my versions and accept all "their" versions. (But not the other way round). It is really timeconsuming to click tens or hundreds of times on "their version", without any real gain (particularly with objects that are deleted locally but not in "their version", where you cannot copy (at least I didn't find it) the id of the object and you cannot zoom to the conflict (because the object is not there in your version) (maybe you could zoom to the their version coordinates in this case?). Very few mappers are going to manually copy 85 node ids from the conflict window into their browser to see which node it is.

Attachments (0)

Change History (12)

comment:1 Changed 4 years ago by dieterdreist

or maybe allow for a "maximum" version (always choose the undeleted object)

comment:2 Changed 4 years ago by naoliv

Sometimes using "my version" for all the conflicts is needed too.
We have valid cases for every option/action.

comment:3 Changed 4 years ago by simon04

In 9440/josm:

see #12338 - Conflict resolution: add expert actions "Resolve to my/their versions" in popup menu

This resolves all selected conflicts to my/their versions.

comment:4 Changed 4 years ago by simon04

Milestone: 16.02

comment:5 Changed 4 years ago by Klumbumbus

there is a typo, line 131 and 542 of conflictdialog.java ResolveTpMyVersionAction()

Last edited 4 years ago by Klumbumbus (previous) (diff)

comment:6 Changed 4 years ago by simon04

In 9452/josm:

see #12338 - Typo

comment:7 Changed 4 years ago by simon04

Thanks for spotting the typo ..

Do we need additional quick conflict resolutions?

comment:8 Changed 4 years ago by naoliv

I guess this should also solve #5335?

comment:9 in reply to:  5 Changed 4 years ago by stoecker

Replying to Klumbumbus:

there is a typo, line 131 and 542 of conflictdialog.java ResolveTpMyVersionAction()

You have commit access, you can also fix such things :-)

comment:10 Changed 4 years ago by simon04

#5335 seems quite the same :), only the wording is different – "Resolve using theirs" (#5335) vs. "Resolve to their versions" (r9452) …

comment:11 Changed 4 years ago by simon04

In 9482/josm:

see #12338 fix #12381 - AssertionError on "Resolve to their versions"

comment:12 Changed 4 years ago by simon04

Resolution: fixed
Status: newclosed

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.

Add Comment


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

 
Note: See TracTickets for help on using tickets.