{"thread":{"id":"54344","subject":"git add --intent-to-add and git stash","startedAt":"2020-10-04T18:53:40Z","lastAt":"2020-10-04T18:53:40Z","messageCount":1,"participants":["Jonathan Müller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"406888","messageId":"b16f61b9-7f0f-38ab-7200-58ad5e659321@gmail.com","threadId":"54344","inReplyTo":null,"subject":"git add --intent-to-add and git stash","fromName":"Jonathan Müller","fromEmail":"jonathanmueller.dev@gmail.com","sentAt":"2020-10-04T18:53:23Z","receivedAt":"2020-10-04T18:53:40Z","isPatch":false,"sender":{"key":"jonathanmueller.dev@gmail.com","avatar":"https://gravatar.com/avatar/b2125bfca28c0051a03f69c4e09a215a45dc71418de7b1ffeb63cf779f4f1c85?d=mp&s=160"},"body":"Hello,\n\nwhen I try to `git stash` a file I have previously added using `git add \n--intent-to-add`, I get an `error: Entry 'X' not uptodate. Cannot \nmerge.` error. I have to manually remove the file from the index, stash, \nand add it again after I've popped the stash.\n\nCan `git stash` be taught to handle such files automatically?\n\nThanks,\nJonathan\n"}]}