[Buildbot-devel] github workflow for Buildbot source tree
Charles Lepple
clepple at gmail.com
Thu Feb 4 04:24:22 UTC 2010
I'm trying out github, and I was going to create a new branch to track
some changes.
However, I "forked" djmitche/buildbot a few days ago, and my changes
are small enough that, if I were working locally, I would just rebase
rather than merge. I tried rebasing a doc change onto a later version
of djmitche/buildbot/master, and GitHub refused my "git push" of my
branch, since it wasn't a fast-forward. I created a new branch, and
pushed that, and now I get a 404 for http://github.com/clepple/
buildbot (I'm hoping that last part was mere coincidence).
At this point, I'm having a bit of trouble separating what seems to be
expected behavior with github, versus unexpected behavior due to
github downtime.
I re-read http://buildbot.net/trac/wiki/SubmittingPatches and didn't
see any mention of rebasing. What is the recommended way to keep
patches based on a current head?
--
Charles Lepple
More information about the devel
mailing list