Try to fix CONFLICT on pop

[ecarreras]

• After doing git stash pop check if there are any unmerged file.
• If there is an error reset the stash pop and keep the stash

We can undo the stash pop (keeping the stash) doing git reset --merge https://stackoverflow.com/questions/8515729/aborting-a-stash-pop-in-git

[guilleJB]

Could generate a git diff file before to stash dirty code and delete it when all runs well?

[ecarreras]

Could generate a git diff file before to stash dirty code and delete it when all runs well?

Why? the stash doesn't get deleted if we do a git reset --merge

[guilleJB]

Why? the stash doesn't get deleted if we do a git reset --merge

Sorry, I'm read git merge --reset not git reset --merge