Unity is not working

I am using Unity 4.3 on a mac and it was working fine until a few minutes ago.

Now it is always frozen and a rainbow wheel is spinning around. I have forced the software to shutdown using the activity monitor several times and I’ve also re-started the computer. That has not solved the problem.

How do I fix this ? Please help.


First, you should try opening different projects. If that doesn’t work, you should try closing any programs you may be running, and if that still doesn’t work, you should uninstall and then reinstall unity.

I solved the problem after being stuck for over an hour. There was a merge conflict in the main scene when I updated my repository. I had to resolve them before unity would un-freeze.