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, we get unintentional conflicts if we merge revisions from vendor import branches into another branch, for instance: file foo.cpp with revision 1.1.1.3 merged to HEAD with the resulting revision 1.2. Is this a known behavior? And if yes is it treated as bug? Best regards, Tilo Riemer -- Tilo Riemer Vision Experts GmbH Hauptstr. 3 D-01640 Coswig Tel.: +49 3523 530 29 41 Fax: +49 3523 530 29 47 eMail: triemer at Vision-Experts.com --------------------------------------- Sitz der Gesellschaft: Karlsruhe Handelsregister: Mannheim HRB 108409 Geschäftsführer: Hans Hermann Bibel Dr. Christian Kaiser USt-ID: DE198001575 St-Nr.: 34418/53400 ---------------------------------------