From: Ittay Dror <ittay.dror@gmail.com>
To: git@vger.kernel.org
Subject: Merge only complete commits
Date: Wed, 03 Sep 2008 16:52:58 +0300 [thread overview]
Message-ID: <48BE96BA.1000106@gmail.com> (raw)
Hi,
Starting with '12345678', one branch creates a change '1A345678', the
other '1B345C78'. Merging of the branches will result in '1<A=B>345C78'.
But isn't it logical to assume that if changes 'B' and 'C' were done in
the same commit, then they are related and so a conflict in one
implicitly means a conflict in the whole commit?
Of course, in a case of a single file, with a single commit, it is easy
to detect. But what if there have been a history of commits before the
merge, or if several files were changed?
Maybe help me find the commit by including them in the RCS conflict
markers?
Ittay
--
--
Ittay Dror <ittay.dror@gmail.com>
reply other threads:[~2008-09-03 13:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=48BE96BA.1000106@gmail.com \
--to=ittay.dror@gmail.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).