From: Jonathan Müller Date: Sun, 04 Oct 2020 18:53:23 GMT Subject: git add --intent-to-add and git stash Message-ID: Hello, when I try to `git stash` a file I have previously added using `git add --intent-to-add`, I get an `error: Entry 'X' not uptodate. Cannot merge.` error. I have to manually remove the file from the index, stash, and add it again after I've popped the stash. Can `git stash` be taught to handle such files automatically? Thanks, Jonathan