From: funeeldy <Marlene_Cote@affirmednetworks.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict
Date: Thu, 14 Jul 2011 11:33:39 -0700 (PDT) [thread overview]
Message-ID: <1310668419989-6584432.post@n2.nabble.com> (raw)
In-Reply-To: <4D81C1AA.5010008@morey-chaisemartin.com>
How can new users of git submodules learn about merge conflicts? When and
why they occur, and how to resolve them in a way that doesn't lose commits?
If I have to choose my version or their version, that isn't really a merge,
or is it?
Thanks.
--
View this message in context: http://git.661346.n2.nabble.com/PATCH-git-submodule-Remove-duplicate-entries-during-merge-with-conflict-tp6180061p6584432.html
Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2011-07-14 18:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 8:09 [PATCH] git-submodule: Remove duplicate entries during merge with conflict Nicolas Morey-Chaisemartin
2011-03-17 18:47 ` Junio C Hamano
2011-03-17 20:50 ` Junio C Hamano
2011-03-21 8:43 ` Nicolas Morey-Chaisemartin
2011-03-21 20:53 ` Jens Lehmann
2011-03-21 20:29 ` Jens Lehmann
2011-03-21 20:59 ` Junio C Hamano
2011-03-21 21:34 ` Nicolas Morey-Chaisemartin
2011-03-21 22:01 ` Jens Lehmann
2011-03-22 6:28 ` Nicolas Morey-Chaisemartin
2011-07-14 18:33 ` funeeldy [this message]
2011-07-15 19:27 ` Jens Lehmann
2011-07-15 20:32 ` Marlene Cote
2011-07-15 21:41 ` Jens Lehmann
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=1310668419989-6584432.post@n2.nabble.com \
--to=marlene_cote@affirmednetworks.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).