Hi !
This is not exactly what you asked for, but I still share it because it could maybe be useful.
I am using git/GitHub to work on a TiddlyWiki with someone else, and I build a system so I can commit/push and manage merge conflicts inside the wiki.
I didn’t update the GitHub repository but there are improvements on the wiki I am currently using, so tell me if it could be helpful and I will update it.