From: Sitaram Chamarty <sitaramc@gmail.com>
To: Neal Kreitzinger <neal@rsss.com>
Cc: git@vger.kernel.org
Subject: Re: force "unmerged" for same-file auto-merges
Date: Sat, 27 Mar 2010 14:26:59 +0530 [thread overview]
Message-ID: <2e24e5b91003270156r11ae9155s6e00a2ab27e9f479@mail.gmail.com> (raw)
In-Reply-To: <hobqoc$5h3$1@dough.gmane.org>
On Wed, Mar 24, 2010 at 7:14 AM, Neal Kreitzinger <neal@rsss.com> wrote:
> Scenario: "same-file auto-merge": when two different people change the
> same file in their separate repos. Their changes do not conflict in the
> sense that they are changes to the same lines. However, their changes do
> conflict in the sense that the resulting merged logic is incorrect.
You're not being pessimistic enough :-) A ".h" file that changed only
on one side can cause the same logic issues
> Desired Solution:
> Perform same-file auto-merge and produce auto-merge results, but mark all
> such auto-merged files as "unmerged" so that they must be reviewed/resolved
> before a git-commit. The "unmerged" status allows git-mergetool to be run
> (e.g. kdiff3) so that the merged lines can be reviewed. In this way, all
> auto-merged files are reviewed.
No. What you need is a full blown diff for the merge, with both sides
being compared with respect to the common merge-base. That diff will
be pretty big, although I'm not sure what diff options would actually
produce that (but I'll bet "-m" figures somewhere).
prev parent reply other threads:[~2010-03-27 8:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-24 1:44 force "unmerged" for same-file auto-merges Neal Kreitzinger
2010-03-26 1:04 ` Neal Kreitzinger
2010-03-27 17:22 ` Dilip M
2010-03-26 19:29 ` Junio C Hamano
2010-03-27 8:56 ` Sitaram Chamarty [this message]
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=2e24e5b91003270156r11ae9155s6e00a2ab27e9f479@mail.gmail.com \
--to=sitaramc@gmail.com \
--cc=git@vger.kernel.org \
--cc=neal@rsss.com \
/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).