#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 , 9 years ago
comment:2 by , 9 years ago
Sometimes using "my version" for all the conflicts is needed too.
We have valid cases for every option/action.
comment:4 by , 9 years ago
Milestone: | → 16.02 |
---|
follow-up: 9 comment:5 by , 9 years ago
there is a typo, line 131 and 542 of conflictdialog.java ResolveTpMyVersionAction()
comment:7 by , 9 years ago
Thanks for spotting the typo ..
Do we need additional quick conflict resolutions?
comment:9 by , 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 , 9 years ago
comment:12 by , 9 years ago
Resolution: | → fixed |
---|---|
Status: | new → closed |
comment:13 by , 4 years ago
Typo or intended?
-
src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
463 463 464 464 @Override 465 465 public void decideRemaining(MergeDecisionType decision) { 466 if (!model.isDecided Coord()) {466 if (!model.isDecidedDeletedState()) { 467 467 model.decideDeletedStateConflict(decision); 468 468 } 469 469 if (!model.isDecidedCoord()) {
or maybe allow for a "maximum" version (always choose the undeleted object)