On 2011-09-02 14:21, Bernhard wrote:
>>> Question/Issue 2: Why does Tortoise show conflicts in lines 256 - 301?? Those lines aren't different. The only difference is in line 255!?
>> It is three-way merge I guess you changed that block (256-301) in both
>> file even with most lines same.
> Yeah, but generally: Why does Tortoise report conflicts when the result in both changes is the same?
I thing that is because there are two different BLOCKS even they differ
just in one line. If you make SAME change in both files it will not be
marked as conflict.
>>> Can anybody tell what's going wrong here? If it is helpful, I can also provide the files where tortoise stores the revisions.
>> It it always good idea to send minimal test files. You can learn
> Ok, I've attached the concerned files.
Yours are not a MINIMAL ones. I tried to make set of minimal (smallest
possible). See attachment.
In YourB.txt is same modification as in my.txt - block is not in
conflict, while YoursA.txt have different change in first line in block
- whole block is in conflict. Makes this sense ?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2834586
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
- application/x-zip-compressed attachment: tmerge.zip
Received on 2011-09-02 15:00:39 CEST