Uploaded image for project: 'XWiki Commons'
  1. XWiki Commons
  2. XCOMMONS-1682

Allow to perform custom decisions in case of merge conflict

    XMLWordPrintable

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 11.5
    • Fix Version/s: 11.7-rc-1
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Difficulty:
      Unknown
    • Similar issues:

      Description

      The current implementation of the 3-way merge in DefaultDiffManager only handles conflict by applying a fallback which is the same for all happening conflicts.
      However we want to be able to make different decisions depending on the conflict (e.g. to choose the current version for one conflict, and then the previous version for another). We should also be able to support choosing a custom conflict resolution: not something coming from one version, but an entirely new chunk coming from the user.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              surli Simon Urli
              Reporter:
              surli Simon Urli
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: