scipy/scipy — comment on commit 11c2ea4733769130c1a86ad9fcfc81c741b82e5e
File:  line 0
By charris:

I don't see any indication that this was developed in a branch, so that might be the problem. Travis, *all* work should be done in a branch, even changing a comma. Master should only be used for merging branches and must be kept up to date with upstream. always do git log --graph after you do the merge and before pushing upstream, and if things don't look right, git reset --hard ORIG_HEAD, then repeat until you get it right ;)