title: Solving merge conflict on git stash apply
body: <p>I did a <code>git stash</code> on branch I am working on and checkout out to another branch. Now when I checked out to my previous branch and did a <code>git stash apply</code> it shows I have a conflict</p>
  
  <pre><code>Auto-merging projects/src/app/feature/some.service.ts
  CONFLICT (content): Merge conflict in projects/src/app/feature/some.service.ts
  </code></pre>
  
  <p>I have resolved the conflict and tried the <code>git stash apply</code> but it still throws the same error. Tried resolving the conflict, <code>git add .</code> and <code>git stash apply</code>, still same error.</p>
  
  <p>I saw many threads talking about resolving this but I am afraid I may loose all my changes. Pls help</p>