From: "Коньков Евгений" <kes@reg.ru>
To: git@vger.kernel.org
Subject: merging branches
Date: Mon, 22 Oct 2012 20:33:23 +0400 [thread overview]
Message-ID: <1393648016.20121022203323@reg.ru> (raw)
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
next reply other threads:[~2012-10-22 16:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-22 16:33 Коньков Евгений [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-13 21:28 Merging branches jhapk
2010-07-13 22:05 ` Ævar Arnfjörð Bjarmason
2010-07-14 5:24 ` Avery Pennarun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393648016.20121022203323@reg.ru \
--to=kes@reg.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.