[cvsnt] merge direction

Bo Berglund bo.berglund at telia.com
Mon Nov 17 22:33:21 GMT 2003

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

On Mon, 17 Nov 2003 09:18:01 -0500, "Yang, Judy Bin"
<jyang at atsautomation.com> wrote:

>Does anybody knows the merge result between "merge from branch to main
>trunk" and "merge from main trunk to branch" ?
>Does the direction matter ? If it does, how the result  will be the
>different ? Thanks.

Merges are always from somewhere specified on the command line to the
current sandbox. So if the sandbox is on a branch the merge will be
towards the branch and vice versa. After the merge is done the changed
files are only existing in the sandbox, they will not get to the
server unless you commit them.

(Bo Berglund, developer in Sweden)

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook