Details
-
Type:
Improvement
-
Status: Closed
-
Priority:
Major
-
Resolution: Fixed
-
Affects Version/s: 11.3
-
Fix Version/s: 11.8-rc-1
-
Component/s: Web - Templates & Resources
-
Labels:None
-
Tests:Unit, Integration
-
Difficulty:Unknown
-
Documentation in Release Notes:
-
Similar issues:
Description
The fix provided with XWIKI-175 allows to make different choices for merging conflicts. However it's currently only possible to make choice for an entire version vs another.
It would be useful for users to be able to make choices by chunk changes or even to allow custom fixes on some conflict chunks.
Attachments
Issue Links
- depends on
-
XCOMMONS-1682 Allow to perform custom decisions in case of merge conflict
-
- Closed
-
-
XCOMMONS-1706 Provide conflict information inside the unified diff display
-
- Closed
-
- is related to
-
XWIKI-17311 Possible NPE when performing document merges with inserted attachments
-
- Closed
-
- relates to
-
XWIKI-175 Merge on Save
-
- Closed
-
-
XWIKI-16703 ExtensionManager: allow to fix each conflict independently
-
- Closed
-