Re: 'untracked working tree files would be overwritten by merge' on ignored files?

On Tue, 14 Jun 2016 10:06:16 +, Junio C Hamano wrote: ... > > IIRC, untracked files are kept during merge and across checking out > another branch. Files that are deliberately marked as ignored by > listing them to .gitignore mechanism are considered expendable, and > they will be removed as

Re: 'untracked working tree files would be overwritten by merge' on ignored files?

Andreas Krey writes: > when I have an ignored file in my workspace, is git > then also assumed not to remove it in the course > of a merge? IIRC, untracked files are kept during merge and across checking out another branch. Files that are deliberately marked as ignored by

'untracked working tree files would be overwritten by merge' on ignored files?

Hi all, when I have an ignored file in my workspace, is git then also assumed not to remove it in the course of a merge? Shouldn't it then say that the file is ignored, as it does not show up in the untracked section of git status? Regards, Andreas PS: Test script (will remove anything named