git4idea: Added blocking project update until unstashed merge resolves.