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

Improve merge algorithm

    XMLWordPrintable

    Details

    • Type: Improvement
    • Status: Open
    • Priority: Minor
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: Diff
    • Labels:
      None
    • Difficulty:
      Unknown
    • Similar issues:

      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

            Activity

              People

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

                Dates

                Created:
                Updated: