From: Luben Tuikov <ltuikov@yahoo.com>
To: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: git merge (resolve) _is_ stupid
Date: Mon, 31 Jul 2006 10:12:29 -0700 (PDT) [thread overview]
Message-ID: <20060731171229.24870.qmail@web31802.mail.mud.yahoo.com> (raw)
In-Reply-To: <7v7j1u88ol.fsf@assigned-by-dhcp.cox.net>
I had seen something similar:
Merging linux-scsi into my own branches whereby both had a
particular patch (03aba2f79594ca94d159c8bab454de9bcc385b76),
git-merge complained that a resolve is needed.
After manually "resolving" the result was identical to
either branch (linux-scsi and my own), so in fact the
diff was 0.
I found this strange, but due to lack of time couldn't
pursue it further.
Luben
prev parent reply other threads:[~2006-07-31 17:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-31 8:44 git merge (resolve) _is_ stupid Junio C Hamano
2006-07-31 10:42 ` Johannes Schindelin
2006-07-31 11:01 ` Junio C Hamano
2006-07-31 11:13 ` Johannes Schindelin
2006-07-31 17:12 ` Luben Tuikov [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=20060731171229.24870.qmail@web31802.mail.mud.yahoo.com \
--to=ltuikov@yahoo.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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