I had the same problem where it said it was "syncing" but it wasn't doing anything. I found some parentheses ( & ) on filenames that were renamed "Conflicted copy with...(my other Mac)" on some recent images. I threw away those files and it started syncing again.
... View more