Re: git overwriting local ignored files?
- Date: Sat, 24 Nov 2018 21:06:35 -0500
- From: David Mandelberg <david@xxxxxxxxxxxxxx>
- Subject: Re: git overwriting local ignored files?
On 11/24/18 10:41 AM, Konstantin Khomoutov wrote:
On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote:
On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote:
It seems that git is overwriting my local files on merge if they're in
The .gitignore file is to list "ignored and expendable" class of
files; there is no "ignored but precious class" in Git.
Ok. Would a patch be welcome? I have three ideas for how to implement it,
and I'm not sure which is better.
You might want to first investigate this recent thread  which AFAIK
was dedicated to exactly this problem.
Well, actually the thread is old, but its continuation  is recent.
The crux is that it discusses certain approaches to solve the apparent
problem and patches to do that.
Thanks for the pointers, and sorry to start a new thread. It looks like
most of the work to do is in finding consensus on the right way forward,
rather than in writing a patch. While I really would like there be a way
to prevent git from overwriting ignored files, I don't have any strong
opinions on what that way should look like. So I think I'll just wait
and hope somebody else does the work.