Hi! I'm wondering how to proceed; some of the patches in the pr-msvc-support branch no longer apply cleanly to git-head. So, before things get totally out of hand, I would like to rebase the branch. However, I have never rebased anything before. I could probably rebase my own repo, but I don't know how to push that rebase to the repo on savannah. man git-rebase only talks about rebasing a local repo, and there are big fat warnings about rebasing when you are collaborating with others... Should I kill the branch on savannah, rebase my local tree and finally push a brand new pr-msvc-support branch? Should I create a new topic branch named pr-msvc-support2? Should I merge git-head into the branch? That sure feels backwards, but what do I know? Please help.
I have exported 22 patches from my git repo (three or four are not yet pushed to the savannah repo) and have modified those that need modification so that they apply cleanly to git-head, so I know exactly what needs to be done. At least I think I do, I haven't tested the result yet... BTW, I think some of those patches have merit on their own and could probably be cherry-picked into git-head, if someone cares enough. One final minor question, should we skip the patches to ChangeLog in the branch and recreate that part of the patches when/if the branch is merged? It seems that there is approximately 100% risk for the ChangeLog hunk to cause merge problems. Cheers, Peter
