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 > > > > .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. Well, actually the thread is old, but its continuation [2] is recent. The crux is that it discusses certain approaches to solve the apparent problem and patches to do that. 1. https://public-inbox.org/git/4C6A1C5B.4030304@xxxxxxxxxxxxxxxxx/ 2. https://public-inbox.org/git/871s8qdzph.fsf@xxxxxxxxxxxxxxxxxxx/
