title: Git: change branch in the middle of solving conflicts (stash doesn't work)
body: <pre><code>git version 2.6.3.windows.1
  </code></pre>
  
  <p>I have a <code>pull request</code> I need to to do.<br>
  So I checkout out to a new branch (<code>pull_feature_branch</code>). did the <code>pull</code> request, which resolved in <strong>many</strong> conflicts. </p>
  
  <p>No problem- I just need time to fix them, Should take me a few days.</p>
  
  <p>But suddenly I discover a bug which I must attend to- in the main branch.
  But I can't checkout out from my <em>pull_feature_branch</em> branch to my main branch.</p>
  
  <p>Usually I <em>stash</em> my uncommited changes in other branch- which allow me to checkout to main branch to fix bug .</p>
  
  <p>But right now <em>stash</em> doesn't work-</p>
  
  <pre><code>fatal: git-write-tree: error building trees
  Cannot save the current index state
  </code></pre>
  
  <p>There must be a way for me to halt my conflict procedure, fix the bug, and then return to fixing the conflicts.</p>
  
  <p>Now I know I can "kinda" solve it (<em>avoid</em> is the more suitable word) by creating another project folder (either by cloning the project or using <code>worktree</code> command- see <a href="https://stackoverflow.com/a/34533239/2502605">CodeWizard's answer</a>)
  And use one folder for solving conflicts, and the other for solving the bug.</p>
  
  <p>I'm looking for a way to be able to change branch, within the same folder.</p>
  
  <p>To summarize: I did a <em>pull</em> request which made many <em>conflics</em> and now I'm "stuck" in current conflicts branch without the ability to change branch.</p>