{"thread":{"id":"35944","subject":"`git stash pop` UX Problem","startedAt":"2014-02-24T08:33:18Z","lastAt":"2014-02-24T08:33:18Z","messageCount":1,"participants":["Omar Othman"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"235230","messageId":"CAHvLNFtZpE5RbeMYL8ZRFc6JCDUxzZmxtsg13w=P8er8ki8mzg@mail.gmail.com","threadId":"35944","inReplyTo":null,"subject":"`git stash pop` UX Problem","fromName":"Omar Othman","fromEmail":"omar.m.othman@gmail.com","sentAt":"2014-02-24T08:33:18Z","receivedAt":"2014-02-24T08:33:18Z","isPatch":false,"sender":{"key":"omar.m.othman@gmail.com","avatar":null},"body":"Hi there,\n\nI'm fairly new to git and I wanted to ask about a certain behavior\nthat I want to fix myself (if you agree with me that it is a\nmisbehavior)... since I've never contributed to open source and it'll\nbe an important step for me to start and get something done.\n\nIn general, whenever something a user \"should\" do, git always tells.\nSo, for example, when things go wrong with a merge, you have the\noption to abort. When you are doing a rebase, git tells you to do git\ncommit --amend, and then git rebase --continue... and so on.\n\nThe point is: Because of this, git is expected to always instruct you\non what to do next in a multilevel operation, or instructing you what\nto do when an operation has gone wrong.\n\nNow comes the problem. When you do a git stash pop, and a merge\nconflict happens, git correctly tells you to fix the problems and then\ngit add to resolve the conflict. But once that happens, and the\ninternal status of git tells you that there are no more problems (I\nhave a prompt that tells me git's internal status), the operation is\nnot culminated by dropping the stash reference, which what normally\nhappens automatically after a git stash pop. This has actually\nconfused me for a lot of time, till I ran into a git committer and\nasked him, and only then were I 100% confident that I did nothing\nwrong and it is indeed a UX problem. I wasted a lot of time to know\nwhy the operation is not completed as expected (since I trusted that\ngit just does the right thing), and it turned out that it is git's\nfault.\n\nIf this is accepted, please reply to this email and tell me to start\nworking on it. I've read the Documenation/SubmittingPatches\nguidelines, but I'll appreciate also telling me where to base my\nchange. My guess is maint, since it's a \"bug\" in the sense of UX.\n\nThanks and sorry for the long email.\n\n-- \nBest Regards,\n\nOmar Othman\n"}]}