Changes between Initial Version and Version 6 of Ticket #18212


Ignore:
Timestamp:
2019-10-08T21:17:17+02:00 (5 years ago)
Author:
mkoniecz
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #18212

    • Property Keywords conflict added

  • Ticket #18212 – Description

    initial v6  
    221. Spot copyright violation added in changesets https://www.openstreetmap.org/changeset/72260628 and https://www.openstreetmap.org/changeset/72260619
    332. Use reverter plugin to revert one of changesets
    4 3. Run into 9k+ conflicts (as someone edited what was added in undiscussed import to remove invalid tags) - note that conflicts are between my version (deleted) and their version (edited), not deleted
     43. Run into 9k+ conflicts (as someone edited what was added in undiscussed import to remove invalid tags) - note that conflicts are between my version (deleted) and their version (edited, not deleted)
    554. Select all conflicts with ctrl+a, right click, select "resolve to my versions"
    665. wait for conflicts to resolve (around one minute)