These are chat archives for astropy/astropy

5th
Jul 2016
hettlage
@hettlage
Jul 05 2016 10:56
@astrofrog - Thanks for your offering to walk me through the rebase process.
Thomas Robitaille
@astrofrog
Jul 05 2016 12:38
@hettlage - are you still around?
hettlage
@hettlage
Jul 05 2016 12:39
Yes, I am.
Thomas Robitaille
@astrofrog
Jul 05 2016 12:39
Ok great :) shall we go through the rebase now?
If so, can you let me know the output of:
hettlage
@hettlage
Jul 05 2016 12:40
Always worth a try. :)
Thomas Robitaille
@astrofrog
Jul 05 2016 12:40
git branch
git remote -v
inside your astropy repository
hettlage
@hettlage
Jul 05 2016 12:41
isilimela:astropy christian$ git branch
master
Thomas Robitaille
@astrofrog
Jul 05 2016 12:42
ok thanks - now before we do the rebase, can you fix the space issue mentioned in the PR comments? just make a new commit for that
let me know once you are done with that
hettlage
@hettlage
Jul 05 2016 12:43
Assuming the space was that right at the start of the doc string, I've done that already (but haven't pushed it to Github).
Thomas Robitaille
@astrofrog
Jul 05 2016 12:44
ok cool - then now do:
git fetch astropy
(just let me know each time a command has been run, since I don't want to go too fast)
hettlage
@hettlage
Jul 05 2016 12:45
isilimela:astropy christian$ git fetch astropy
fatal: unable to connect to github.com:
github.com[0: 192.30.253.112]: errno=Connection refused
Thomas Robitaille
@astrofrog
Jul 05 2016 12:46
huh
weird, you must be on a connection that forbids git URLs
hettlage
@hettlage
Jul 05 2016 12:48
Is there anything I can do about this?
Thomas Robitaille
@astrofrog
Jul 05 2016 12:48
let's fix that remote
git remote remove astropy
git remote add astropy http://github.com/astropy/astropy.git
(changing from git:// to http:// basically)
let me know if that works
hettlage
@hettlage
Jul 05 2016 12:49
Ah, this time fetch has worked.
Thomas Robitaille
@astrofrog
Jul 05 2016 12:50
ok great
so now:
git rebase -i astropy/master
it will come up with a list of commits, do you see that?
probably a list of 6 commits
any luck?
hettlage
@hettlage
Jul 05 2016 12:52
It actually opened an emacs with text (including the six commits).
Thomas Robitaille
@astrofrog
Jul 05 2016 12:52
yep ok, so do you see how it says 'pick' at the start of each line
hettlage
@hettlage
Jul 05 2016 12:52
Yes.
Thomas Robitaille
@astrofrog
Jul 05 2016 12:53
change all of them except the first one to s (which stands for squash)
so basically it picks the first commit and squashes all the other ones onto it
once you've done that, save and exit emacs, and it should proceed with the rebase
it will then ask you for a commit message - remove all the existing messages in that view and then write a new message instead (or keep one of the existing ones)
once you save, it should finish rebasing and you should be done
Thomas Robitaille
@astrofrog
Jul 05 2016 12:59
did it work?
hettlage
@hettlage
Jul 05 2016 13:01
Yes. I have a rebased and updated branch now.
I guess I may push that to Github now?
Thomas Robitaille
@astrofrog
Jul 05 2016 13:01
perfect - yes!
you'll need to include the -f flag to force push
the push command should look like:
git push -f hettlage modify-quantity-documentation
hettlage
@hettlage
Jul 05 2016 13:06
Done.
Thomas Robitaille
@astrofrog
Jul 05 2016 13:08
Great!
Looks good to me :)
hettlage
@hettlage
Jul 05 2016 13:09
Great.
Thanks for your help!
Adrian Price-Whelan
@adrn
Jul 05 2016 18:55
Do the docs build somewhere else now? I'm used to them appearing in <repo root>/docs/_build/html but on a fresh clone of master they seem to have built in <repo root>/build/sphinx/html