Doubt about merges

People,

We have a complex environment of work where we have a product that is
composed of some modules. And we develop customizations to our clients.
Theses customizations needs to be integrated to the product and have to be
configurable (the user may choose if he wants to use this functionality). We
have different versions of our products and modules that are running in our
clients.

We use the idea that new functionalities are developed in branches and when
finished is made a merge into the trunk. When this happens, we have a
complex merge to do.

The merge is related to binary files and text files. We are insecure to use
the functionality of merge of TortoiseSVN, because of this, we use the
WinMerge. But, it is not useful to binary files.

I would like to know some strategies to do this process of merge and
personal experiences too.

Thanks,
Leandro de Paula Silva
Received on Fri Sep 29 16:38:22 2006