Did an update this morning on my project and there was a small merge to do. Afterwards I notice that my git stashes are not empty. Is it true that a stash entry is left whenever there is a merge (even if merge is done and update successful)? I would rather these old stashes were not kept around as it can be confusing later.
As an aside this stemmed from an error trying to update when IDEA showed:
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed
This message doesn't make a lot of sense to me because IDEA is meant to have already stashed local changes before tying to do the pull. Me and a colleague have both seen this message from time to time and it causes no end of confusion when it happens. I'd love to understand why it happens...