Way back when we imported the HIG into gnome-devel-docs, I had a hig-devel branch set up for Calum’s work on the next generation of the HIG. Except branches in SVN aren’t really branches; they’re just separate directories we copy into. And I very stupidly took advantage of this fact by making the hig-devel “branch” be just a mirror of the hig/C directory of gnome-devel-docs/trunk.
My fault completely. I shouldn’t have done that.
Now I’m trying to find a way to fix this branch in git. If I just merge master into hig-devel, it basically blows everything away. Git has no way of knowing that it should apply changes from some completely unrelated files that don’t exist in master.
Worst case scenario, I suppose I just do the merge, copy the hig-devel versions of all the files in, and commit. Anybody have any ideas on how to do this in a way that preserves some history?