[wp-hackers] GitHub + plugins.svn.wordpress.org

[Steve Taylor]

I'm looking into integrating my wordpress.org plugins with GitHub.
I've actually got all my wp.org plugins on GitHub already - properly
integrating them looked a bit tricky at first glance so I've just been
pushing development changes to GitHub and manually releasing new
versions via SVN to wp.org.

This seems to be the best guide to achieving what I'm after:

http://teleogistic.net/2011/05/revisiting-git-github-and-the-wordpress-org-plugin-repository/

However, this bit doesn't bode well for me:

"If you have active, separate commit histories in both svn and Github,
may God have mercy on your soul."

I followed the instructions and all went well until Part 3. Doing "git
rebase trunk" seemed to throw me into severe confusion - probably a
little to do with my lack of experience with rebasing, but also, I'm
sure, to do with my need for God's mercy (see above).

Any suggestions for getting this integration working? I wouldn't mind
if I lost the revision history on GitHub for any of the plugins, if
this is the only way to do it. But would there be any repercussions to
this? And how would I do it properly anyway?

Any help very welcome!

Steve