I use github as a final publication point for a subversion repository. In the past, this has gone well. I’m familiar with how to create and maintain a git repo that mirrors the changes checked into subversion.
My troubles started, however, when the subversion repo had to be restored from backups, making the github.com repo one (1) check-in ahead of the existing subversion repo.
Since then, I’ve had to add a step where I update my local git repo from subversion, then merge changes from github, and finally push all changes to github. This is not going to work forever. I see two solutions, neither of which I know how to do:
Figure out how to get the change in github merged back down to the subversion repo in a way that github will recognize.
Rebuild my github repo from scratch using a prestine version from the head of subversion, without losing all the meta-data, follows, etc attached to my existing github repo.
I know, it’s complicated. Any help is appreciated.