From: Konstantin Khomoutov <kostix@bswap.ru>
Date: Sat, 24 Nov 2018 14:57:24 GMT
Subject: Re: git overwriting local ignored files?
Message-ID: <20181124145723.ow2h7x374xwwts6m@tigra>
In-Reply-To: <7ac49733-2e62-7d29-36aa-99df4124b54c@mandelberg.org>

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
> > > .gitignore.
[...]
> > 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 [1] which AFAIK
was dedicated to exactly this problem.

1. https://public-inbox.org/git/4C6A1C5B.4030304@workspacewhiz.com/