Re: git overwriting local ignored files?

2018-11-24 Thread David Mandelberg
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 .gitignore. [...] The .gitignore

Re: git overwriting local ignored files?

2018-11-24 Thread David Mandelberg
On 11/23/18 11:22 PM, Junio C Hamano wrote: David Mandelberg writes: It seems that git is overwriting my local files on merge if they're in .gitignore. See command transcript below. I searched `git help config` and Google, but I couldn't find any way to prevent it. Am I missing something

git overwriting local ignored files?

2018-11-23 Thread David Mandelberg
Hi, It seems that git is overwriting my local files on merge if they're in .gitignore. See command transcript below. I searched `git help config` and Google, but I couldn't find any way to prevent it. Am I missing something? (The reason I care about ignored files is that I'm using git with a