# git add --intent-to-add and git stash

1 messages from 2020-10-04 to 2020-10-04. Participants: Jonathan Müller.
Thread: https://gitlist.dev/t/54344

## Jonathan Müller, 2020-10-04 18:53

Subject: git add --intent-to-add and git stash
Message-ID: <b16f61b9-7f0f-38ab-7200-58ad5e659321@gmail.com>
URL: https://gitlist.dev/e/b16f61b9-7f0f-38ab-7200-58ad5e659321%40gmail.com

```
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

```
