Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-16464

Merge conflict: allow choice by chunks and custom fixes

          Details

          • Tests:
            Unit, Integration
          • Difficulty:
            Unknown
          • Documentation:
          • 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

                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

                Improvement - An improvement or enhancement to an existing feature or task. XCOMMONS-1706 Provide conflict information inside the unified diff display

                • Major - Major loss of function.
                • Closed
                is related to

                Bug - A problem which impairs or prevents the functions of the product. XWIKI-17311 Possible NPE when performing document merges with inserted attachments

                • Major - Major loss of function.
                • Closed
                relates to

                Improvement - An improvement or enhancement to an existing feature or task. XWIKI-175 Merge on Save

                • Major - Major loss of function.
                • Closed

                Improvement - An improvement or enhancement to an existing feature or task. XWIKI-16703 ExtensionManager: allow to fix each conflict independently

                • Major - Major loss of function.
                • Closed

                  Activity

                    People

                    • Assignee:
                      surli Simon Urli
                      Reporter:
                      surli Simon Urli
                    • Votes:
                      0 Vote for this issue
                      Watchers:
                      2 Start watching this issue

                      Dates

                      • Created:
                        Updated:
                        Resolved: