{"thread":{"id":"28884","subject":"How to resolve git stash conflict without adding to index?","startedAt":"2011-11-08T09:10:04Z","lastAt":"2011-11-08T09:10:04Z","messageCount":1,"participants":["Sven Bachmann"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179130","messageId":"20111108101004.Horde.46VbWsL8999OuPHsJOQ2ZrA@webmail.df.eu","threadId":"28884","inReplyTo":null,"subject":"How to resolve git stash conflict without adding to index?","fromName":"Sven Bachmann","fromEmail":"dev@mcbachmann.de","sentAt":"2011-11-08T09:10:04Z","receivedAt":"2011-11-08T09:10:04Z","isPatch":false,"sender":{"key":"dev@mcbachmann.de","avatar":null},"body":"\nHi Git-Group,\n\nfrom time to time I've got to \"git stash\" a bunch of files (about 20).\nMy problem is, sometimes \"git stash pop\" conflicts and all files are  \nadded to the index - which is not what I want.\n\nI just want to have the same behavior like \"git stash pop\" without  \nconflict has. Resolving the conflict is okay, but not \"git reset HEAD\"  \nto all other files, which I don't want to commit now.\n\nIs there a possibility that \"git stash pop\" does not add all files to  \nthe index when a conflict appears?\n\nI've already asked this question on stackoverflow (  \nhttp://stackoverflow.com/questions/7751555/how-to-resolve-git-stash-conflict-without-commit ) - maybe this helps a bit better to describe the  \nproblem.\n\nPlease add me to CC if possible as I'm not subscribed to this list and  \nreading it in the browser.\n\nThanks a lot in advance!\n   Sven\n"}]}