When I do a git pull, some Xcode tabs lose the file they were editing. I'm using the option in Fork to stash modified files and apply the stash after pulling. Xcode didn't used to have this problem, and it's driving me nuts.

The only workaround I can think of has been to close the Xcode project and reopen it after pulling, which is utterly ridiculous, not to mention a pain in the ass. Is there a better way?