Menu ▾ ▴

#125 Incorrect automatic resolving of conflicts?

open
nobody
None
5
2012-09-23
2009-07-27
No

In the 3-way merge, I have the following: (I also attached the 3 sample files for reference)
A: (The common base version of the file)
if (status != OK)
{
return status;
}

B: (Changed in some branch, note that only the braces were removed)
if (status != OK)
return status;

C: (Changed in another branch, note that 2 lines were inserted)
if (status != OK)
{
if (some-condition)
do-something;
return status;
}

The 3-way merge did not reported this as an automatically resolved conflict, where the result of the merge is:
if (status != OK)
if (attached)
rollback();
return status;

I think such changes in subsequent lines should be reported as unresolved conflict. Am I wrong?

Discussion

  • Anonymous

    Anonymous - 2009-07-27

    A (common base)

     
    file1.cpp

  • Anonymous

    Anonymous - 2009-07-27

    B (Changed in one stream, only braces were removed)

     
    file2.cpp

  • Anonymous

    Anonymous - 2009-07-27

    C (Changed in another stream, a condition has been added)

     
    file3.cpp

  • Anonymous

    Anonymous - 2009-07-27

    Merge result

     
    result.cpp

  • Anonymous

    Anonymous - 2009-07-27

    Sorry, I mistakenly added a stub in the item details, and changed it in the results, but you can try the attached files.