From: Clemens Buchacher <drizzd@aon.at>
To: Junio C Hamano <gitster@pobox.com>
Cc: 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 10:59:49 +0100 [thread overview]
Message-ID: <20081215095949.GA7403@localhost> (raw)
In-Reply-To: <7vmyeyyuuh.fsf@gitster.siamese.dyndns.org>
On Sun, Dec 14, 2008 at 07:34:46PM -0800, Junio C Hamano wrote:
> merge-recursive: do not clobber untracked working tree garbage
>
> When merge-recursive wanted to create a new file in the work tree (either
> as the final result, or a hint for reference purposes while delete/modify
> conflicts), it unconditionally overwrote an untracked file in the working
> tree. Be careful not to lose whatever the user has that is not tracked.
This leaves the index in an unmerged state, however, so that a subsequent
git reset --hard still kills the file. And I just realized that the same
goes for merge-resolve. So I'd prefer to abort the merge, leave everything
unchanged and tell the user to clean up first.
next prev parent reply other threads:[~2008-12-15 10:00 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 [this message]
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
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=20081215095949.GA7403@localhost \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.