From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Clemens Buchacher <drizzd@aon.at>,
git@vger.kernel.org, johannes.schindelin@gmx.de,
raa.lkml@gmail.com
Subject: Re: [PATCH] modify/delete conflict resolution overwrites untracked file
Date: Mon, 15 Dec 2008 17:09:22 -0800 (PST) [thread overview]
Message-ID: <m3r649c4e7.fsf@localhost.localdomain> (raw)
In-Reply-To: <7vprjtug8u.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Clemens Buchacher <drizzd@aon.at> writes:
>
> > I strongly disagree. With the suggested behavior I would have to
> > double-check every single untracked file in my tree for conflicts before
> > trying a throw-away merge followed by git reset --hard, for example.
>
> AFAICS, that's not "suggested behaviour" for merge, but it is the
> behaviour that has been true for eternity.
>
> You can suggest to fix "reset --hard", though.
Errr... what about using "reset --merge" instead?
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2008-12-16 1:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-10 20:12 [PATCH] modify/delete conflict resolution overwrites untracked file Clemens Buchacher
2008-12-10 20:51 ` Junio C Hamano
2008-12-10 21:11 ` Clemens Buchacher
2008-12-10 23:36 ` Junio C Hamano
2008-12-11 8:07 ` Clemens Buchacher
2008-12-11 8:13 ` Junio C Hamano
2008-12-15 0:46 ` Clemens Buchacher
2008-12-15 1:03 ` Junio C Hamano
2008-12-15 3:34 ` Junio C Hamano
2008-12-15 9:34 ` Johannes Schindelin
2008-12-15 10:35 ` Junio C Hamano
2008-12-15 11:03 ` Johannes Schindelin
2008-12-15 9:59 ` Clemens Buchacher
2008-12-15 10:22 ` Junio C Hamano
2008-12-15 10:50 ` Mike Ralphson
2008-12-15 11:09 ` Johannes Schindelin
2008-12-15 11:45 ` Mike Ralphson
2008-12-15 22:13 ` Junio C Hamano
2008-12-15 23:02 ` Clemens Buchacher
2008-12-16 0:16 ` Junio C Hamano
2008-12-16 1:09 ` Jakub Narebski [this message]
2008-12-28 11:44 ` Clemens Buchacher
2008-12-28 22:21 ` Junio C Hamano
2008-12-28 23:53 ` Clemens Buchacher
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=m3r649c4e7.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=raa.lkml@gmail.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).