Details
-
Improvement
-
Resolution: Fixed
-
Major
-
11.6.1
-
None
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
-
XWIKI-16464 Merge conflict: allow choice by chunks and custom fixes
- Closed
- relates to
-
XCOMMONS-1682 Allow to perform custom decisions in case of merge conflict
- Closed