Merging two versions with non-conflicting changes loses earlier changes

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Medium
    • 2.9
    • Affects Version/s: 2.8
    • Component/s: None

      Merging on EAC seems broken, and it has been for a while.

      Say you have an existing page like this:

      Original version
      h2. Section A
      
      h2. Section B
      
      

      Then two users edit at the same time and make the following changes:

      Update 1
      h2. Section A
      
      These are the section A changes. Blah blah blah.
      
      h2. Section B
      
      Update 2
      h2. Section A
      
      h2. Section B
      
      These are the section B changes. Blah blah blah.
      

      If the first change is saved, then the second change, the second user should be presented with a merged version in their editor to save. It doesn't seem like this is the case.

      There also seem to be more complex scenarios where the merge does in fact happen, but the content isn't merged correctly.

              Assignee:
              Don Willis
              Reporter:
              Matt Ryall
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated:
                Resolved: