Solving git stash overriding