From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 23 Aug 2010 09:37:07 GMT
Subject: Re: [PATCH] optionally disable overwriting of ignored files
Message-ID: <vpqd3t9656k.fsf@bauges.imag.fr>
In-Reply-To: <20100818233900.GA27531@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

> By default, checkout and fast-forward merge will overwrite ignored
> files. Make this behavior configurable.

Just mentionning an alternative, or complementary approach:

Instead of overwritting completely a .gitignore-d file, Git could
rename it, and warn the user kindly. For example:

$ git merge
...
Warning: existing ignored file 'foo' renamed to 'foo~'

(in case foo~ already exists, it's possible to use numbered backups
just like "mv --backup=existing" does for example)


That could complement your patch if core.overwriteignored is a
multiple-choice option instead of a Boolean:

- "overwrite" => current behavior
- "refuse" => your proposal
- "rename" => my proposal

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/