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

Merge fallback configuration is not taken when previous->current diff starts before previous->next

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Major
    • 11.7-rc-1, 11.3.3, 10.11.10
    • 10.11.9
    • Diff
    • None
    • Unknown
    • N/A
    • N/A

    Description

      In the following case: the diff between previous and current starts before the diff between next and current.

      Attachments

        Issue Links

          blocks

          Improvement - An improvement or enhancement to an existing feature or task. XCOMMONS-1682 Allow to perform custom decisions in case of merge conflict

          • Major - Major loss of function.
          • Closed

          Activity

            People

              tmortagne Thomas Mortagne
              tmortagne Thomas Mortagne
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: