allow for quicker conflict resolution

[dieterdreist]

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.

[dieterdreist]

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

[naoliv]

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

[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.

[Klumbumbus]

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

[simon04]

In 9452/josm:

see #12338 - Typo

[simon04]

Thanks for spotting the typo ..

Do we need additional quick conflict resolutions?

[naoliv]

I guess this should also solve #5335?

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

[simon04]

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

[simon04]

In 9482/josm:

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

[GerdP]

Typo or intended?

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

@@ -463 +463 @@
 
     @Override
     public void decideRemaining(MergeDecisionType decision) {
-        if (!model.isDecidedCoord()) {
+        if (!model.isDecidedDeletedState()) {
             model.decideDeletedStateConflict(decision);
         }
         if (!model.isDecidedCoord()) {

[GerdP]

See #19792