title: Undo IntelliJ Smart Checkout
body: <p>IntelliJ has a feature that's very cool in theory, called <a href="https://blog.jetbrains.com/idea/2012/03/simpler-and-more-powerful-ui-for-git-branches/" rel="noreferrer">Smart Checkout</a>. This feature kicks in when you're changing branches and you have files in the current branch that you've modified but haven't committed.</p>
  <p>Instead of forcing you to commit, stash or shelve your changes, it stashes them for you, switches branches, then runs <code>stash pop</code> in the new branch.</p>
  <p>I guess this is what you'd want sometimes, but I ran this when switching to the wrong branch.</p>
  <p>So, now my <code>master</code> branch is all full of changes that belong in another branch, some files are reporting merge conflicts, and I have all kinds of pain.</p>
  <p>What I want to accomplish is:</p>
  <ol>
  <li>Cleanly remove the changes from the master branch.</li>
  <li>Move them back to the branch where I was working.</li>
  </ol>
  <p>Is there a way to do this?</p>