Uploaded image for project: 'Replication'
  1. Replication
  2. REPLICAT-57

In case of conflict the 3 ways merge might be done from the wrong common ancestor

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Major
    • 0.8
    • 0.7
    • Entity
    • None
    • Unknown

    Description

      The conflict resolution system is only considering a version which matches the one indicated as the previous version in the message. The problem is that this version might simply not exist anymore or not be the expected one because of a previous conflict which hasn't had time to be resolved in all instances before the new modification was made.

      The message should contain more than the immediate previous version so that we try to match one of them.

      Attachments

        Issue Links

          Activity

            People

              tmortagne Thomas Mortagne
              tmortagne Thomas Mortagne
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: