{"thread":{"id":"31905","subject":"merging branches","startedAt":"2012-10-22T16:33:23Z","lastAt":"2012-10-22T16:33:23Z","messageCount":1,"participants":["Коньков Евгений"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"201703","messageId":"1393648016.20121022203323@reg.ru","threadId":"31905","inReplyTo":null,"subject":"merging branches","fromName":"Коньков Евгений","fromEmail":"kes@reg.ru","sentAt":"2012-10-22T16:33:23Z","receivedAt":"2012-10-22T16:33:23Z","isPatch":false,"sender":{"key":"kes@reg.ru","avatar":null},"body":"Hi, Git.\n\n\nWhile merging branches I get conflicts in files that I have not touch.\nWhy they occour??\n\nMy suggestion is that that files that was automerged GIT counts as\nthey were modified by me, so next automerge to those files fill FAIL.\n\nIf so, how I can escape from that CONFLICT situation?\n\n\n-- \n С уважением,\n Коньков Евгений\n Программист\n Регистратор доменных имен REG.RU\n Телефон: +38 (097) 7654-676\n www.reg.ru\n ___________________\n Sincerely yours,\n Konkov Eugen\n Developer\n Accredited domain Registrar REG.RU, LLC.\n Phone: +38 (097) 7654-676\n www.reg.ru/en/\n\nmailto:kes@reg.ru\n"}]}