Tortoise Merge

I need a help about merging with TortoiseSVN.

We have three environments that are used to control the versioning:
trunk, development branch and patch branch. When I do the merging
between environments and I have some differences, the tool show me a
message of conflict, also I choose the option "Edit Conflict" and, after
this, it's open the TortoiseMerge with also files, but I don't
understand anything because the TortoiseMerge marks all rows with red
color. If I try to merge manually and I click at "Save", the
TortoiseMerge close without merge what I do.

I need to correct this problem. Could you help me, please?

Regards,

Wilson Generoso Junior

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-10-29 16:53:10 CET