I just resolved the conflict (only Makefile.am) for this pull request, #3031 and #3035. All the 3 pull requests are more or less ready to be merged from my perspective.
For the cxx parser here, I'd just point out 2 things to decide: - whether the `__anon` tags are fine for the sidebar for anonymous declarations - whether the different syntax and capabilities of the ignored.tags file are fine (but I'm afraid there's not much we can do here). If so, I'll update the documentation.