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

Allow to perform custom decisions in case of merge conflict

    XMLWordPrintable

Details

    • Improvement
    • Resolution: Fixed
    • Major
    • 11.7-rc-1
    • 11.5
    • Diff
    • None
    • Unit
    • Unknown

    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

          blocks

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-16464 Merge conflict: allow choice by chunks and custom fixes

          • Major - Major loss of function.
          • Closed
          depends on

          Bug - A problem which impairs or prevents the functions of the product. XCOMMONS-1690 Merge fallback configuration is not taken when previous->current diff starts before previous->next

          • Major - Major loss of function.
          • Closed
          is related to

          Improvement - An improvement or enhancement to an existing feature or task. XCOMMONS-1706 Provide conflict information inside the unified diff display

          • Major - Major loss of function.
          • Closed

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: