[cvsnt] ticket #38 (-kk in merge)

David Hauck davidh at netacquire.com
Thu Jun 23 19:41:48 BST 2005


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.


Hi Tony,

> #38     Automatic -kk in merging only affects half of the merge.

Can you please elaborate on what the fix is for this? Is this just a
correction to the merge doing a better job of handling conflicts in
$Header$/$Id$ et al without having to specify -kk in the update command? Or
does this require specifying -kk in the update (and if so, does the binary
file merge problems associated with -kk still exist?)?

Thanks, -David




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