Modify

Opened 9 years ago

Closed 9 years ago

Last modified 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 (14)

comment:1 by dieterdreist, 9 years ago

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

comment:2 by naoliv, 9 years ago

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

comment:3 by simon04, 9 years ago

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 by simon04, 9 years ago

Milestone: 16.02

comment:5 by Klumbumbus, 9 years ago

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

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

comment:6 by simon04, 9 years ago

In 9452/josm:

see #12338 - Typo

comment:7 by simon04, 9 years ago

Thanks for spotting the typo ..

Do we need additional quick conflict resolutions?

comment:8 by naoliv, 9 years ago

I guess this should also solve #5335?

in reply to:  5 comment:9 by stoecker, 9 years ago

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 by simon04, 9 years ago

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

comment:11 by simon04, 9 years ago

In 9482/josm:

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

comment:12 by simon04, 9 years ago

Resolution: fixed
Status: newclosed

comment:13 by GerdP, 4 years ago

Typo or intended?

  • src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

     
    463463
    464464    @Override
    465465    public void decideRemaining(MergeDecisionType decision) {
    466         if (!model.isDecidedCoord()) {
     466        if (!model.isDecidedDeletedState()) {
    467467            model.decideDeletedStateConflict(decision);
    468468        }
    469469        if (!model.isDecidedCoord()) {

comment:14 by GerdP, 4 years ago

See #19792

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

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.