merging branches

From: Коньков Евгений <kes@reg.ru>
Date: Oct 22, 2012, 16:33 UTC
Message-ID: <1393648016.20121022203323@reg.ru>

Hi, Git.

While merging branches I get conflicts in files that I have not touch. Why they occour??

My suggestion is that that files that was automerged GIT counts as they were modified by me, so next automerge to those files fill FAIL.

If so, how I can escape from that CONFLICT situation?

-- 
 С уважением,
 Коньков Евгений
 Программист
 Регистратор доменных имен REG.RU
 Телефон: +38 (097) 7654-676
 www.reg.ru
 ___________________
 Sincerely yours,
 Konkov Eugen
 Developer
 Accredited domain Registrar REG.RU, LLC.
 Phone: +38 (097) 7654-676
 www.reg.ru/en/

mailto:kes@reg.ru