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
    • 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

            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: