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

Provide conflict information inside the unified diff display

    XMLWordPrintable

Details

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

    Description

      The work done on XCOMMONS-1682 allow to get conflict information when a merge is performed and lead to conflict.
      We use the UnifiedDiffDisplayer to present the changes in case of conflict, so we should be able to display the conflict information in such view.

      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
          relates to

          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

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

              Dates

                Created:
                Updated:
                Resolved: