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

Provide conflict information inside the unified diff display

    Details

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

      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

            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: