These are chat archives for astropy/astropy

28th
Jan 2017
David Palmer
@dmopalmer
Jan 28 2017 16:39
@bsipocz : For #5727 I rebased against upstream origin and pushed, and now only my own changes to the files I worked on show up in the diff. This PR has 4 commits in it, whereas the github standard is to have only one commit. What do I type to The code is still WIP,
What do I type to get it to a single commit? I would guess:
% git rebase -i HEAD~4
Then pick the first, squash the other 3. Then
% git commit -a
% git push
David Palmer
@dmopalmer
Jan 28 2017 16:45
(But it's not something I'll try now. Every time I try to do a annihilate history for the sake of github, it ends with me 4 hours later manually copying all of my changes to a new branch, committing once-and-only-once, pushing once-and-only-once, cancelling the old PR and starting a new one.)
David Palmer
@dmopalmer
Jan 28 2017 16:54
Different topic: How do you restart a Travis check? The current one failed in a piece of code I didn't touch on a URL read, so I suspect a network glitch that will not recur if repeated. (The hallmark of insanity is doing the same thing over and over and expecting the same result.)
David Palmer
@dmopalmer
Jan 28 2017 18:23
Also, I committed more changes to the branch 15 minutes ago, and the Pull Request has not been updated. Is that sort of latency typical, or did I do something wrong?
David Palmer
@dmopalmer
Jan 28 2017 18:38
What is wrong is that I somehow am now on origin/origin/coord_offset.