Uploaded image for project: 'XWiki Commons'
  1. XWiki Commons
  2. XCOMMONS-1684

Improve merge algorithm

    XMLWordPrintable

Details

    • Improvement
    • Resolution: Unresolved
    • Minor
    • None
    • None
    • Diff
    • None
    • Unknown

    Description

      Our current implementation of the 3-way merge is a homemade algorithm, it might be interesting to use a more standard implementation or to reuse one if it exists.

      Attachments

        Issue Links

          is related to

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-16631 Unexpected merge behaviour in case of conflict

          • Major - Major loss of function.
          • Closed

          Activity

            People

              Unassigned Unassigned
              surli Simon Urli
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated: