Re: git overwriting local ignored files?
- Date: Sat, 24 Nov 2018 17:57:24 +0300
- From: Konstantin Khomoutov <kostix@xxxxxxxx>
- Subject: Re: git overwriting local ignored files?
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  which AFAIK
was dedicated to exactly this problem.