williamstein/sagelib — comment on commit f4104efd87cb421923f884f8ea5c571fa52d583b
File:  line 0
By kini:

Hi William,

You should base these commits on the branch `master` and not the branch `github-master`. The latter contains an extra file (README.rst) which you won't want in your eventual trac patch. To fix this now, do:

{{{
$ git checkout lfun
$ git rebase upstream/github-master --onto upstream/master
}}}

(The `--onto` stuff might be a bit confusing. Normally you shouldn't need to do rebasing, though.)