Details
-
Improvement
-
Resolution: Fixed
-
Major
-
10.11.9
-
None
Description
We introduced for XWIKI-16464 the mechanism to allow fixing each merge conflicts independently in case of edition conflict.
The same kind of conflict fixing should be available on the extension manager.
Attachments
Issue Links
- is related to
-
XWIKI-16464 Merge conflict: allow choice by chunks and custom fixes
- Closed