Merging in Subversion

Greetings!
                        After a long struggle; Finally I have transferred
all my 100 + VSS Projects to Subversion in Windows environment. I have
strong Branching and Merging requirements for these. I have some Qs from you
guys:-
 
. Which Best practices you guys will advice for this?
. What is the scope of merging files in Subversion?
. Is there any best way to merge files in SVN or you need to
incorporate any strong merging tool?
. What Tool do you recommend in case of over statement true?
 
Gracias
 
 
 Cheers!
 
cid:image001.jpg_at_01CA74D6.C3770120
 
Waseem Bokhari I Configurations and Release Management
NetSol Technologies (NasdaqCM: NTWK)
Tel: +92 42 111448800 Ext: 346 Mob: +92 321 4294926
 <mailto:waseem.bokharii_at_netsoltech.com> waseem.bokhari_at_netsoltech.com
<http://www.netsoltech.com/> www.netsoltech.com
 
 

DISCLAIMER: This e-mail and any file transmitted with it are confidential and intended solely
for the use of the addressee. If you are not the intended recipient, you are hereby advised that
any dissemination, distribution or copy of this email or its attachments is strictly prohibited. If you
have received this email in error, please immediately notify us by return email and destroy this email
message and its attachments. This communication may contain forward-looking statements
relating to the development of NetSol Technologies' products and services and future operations.
The words "believe," "expect," "anticipate," "intend," variations of such words, and similar
expressions, identify forward looking statements, but their absence does not mean that the
statement is not forward-looking. Views and opinions contained herein are those of the author of
this email and do not necessarily represent those of NetSol Technologies. Statements contained
herein are not guarantees of future performance and are subject to certain risks, uncertainties and
assumptions that are difficult to predict. The company will not undertake to update any statements
contained herein.

WARNING: The recipient should check this email and any attachment for the presence of viruses.
Although the company has taken reasonable precautions to ensure no viruses are present in this
email, the company does not accept responsibility for any loss or damage arising from the use of
this email or attachment. Note: Please consider the environment before printing this e-mail.