From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, Daniel Barkalow <barkalow@iabervon.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 4/5] merge-recursive: handle D/F conflict case more carefully.
Date: Mon, 9 Apr 2007 20:58:09 +0200 [thread overview]
Message-ID: <20070409185809.GA13212@steel.home> (raw)
In-Reply-To: <7v6488ckk0.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Sat, Apr 07, 2007 16:42:55 +0200:
> + if (unlink(path)) {
> + if (errno == EISDIR) {
> + /* something else exists */
> + error(msg, path, ": perhaps a D/F conflict?");
isn't this one an F/D conflict?
next prev parent reply other threads:[~2007-04-09 18:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-07 14:42 [PATCH 4/5] merge-recursive: handle D/F conflict case more carefully Junio C Hamano
2007-04-09 18:58 ` Alex Riesen [this message]
2007-04-09 19:53 ` Junio C Hamano
2007-04-10 8:40 ` Alex Riesen
2007-04-10 18:20 ` Junio C Hamano
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=20070409185809.GA13212@steel.home \
--to=raa.lkml@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--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