Changes between Version 3 and Version 8 of Ticket #20006


Ignore:
Timestamp:
2021-11-28T15:28:39+01:00 (4 years ago)
Author:
skyper
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #20006

    • Property Priority normal → major

  • Ticket #20006 – Description

    v3 v8  
    2323Reverter plugin used to create conflicts but I think it is a new feature if properly documented if it does not.
    2424
    25 In my eyes, merging layers needs to create conflicts dependent-less on the order as unlike conflicts with server data both layers can have contradicting changes and both are "my" versions.
     25In my eyes, merging layers needs to create conflicts independent-less on the order as unlike conflicts with server data both layers can have contradicting changes and both are "my" versions.
    2626
    2727I remember to have had similar issues when working offline with small overlapping extracts and then merging several modified extracts before upload.