Revert "DOC: add vstack, hstack, dstack reference to stack documentation." #7196
Conversation
|
Revert the merge. |
|
I just used the interface on GitHub -- my git foo is weak! If you have a preferred way to do this, it would be great if you could do that yourself :) |
|
@charris: not sure I follow, and want to make sure I understand so I don't mess it up myself at some point :-). This pull request seems to be just a single clean patch reverting the doc changes, which is what we want, right? What's the advantage of reverting the merge commit instead? |
|
@njsmith If you just revert the merge the unattached commits are eventually removed. What the revert button does is revert all the commits associated with the merge and each reverted commit gets tested. For instance, if there were ten commits in the PR you would see 11 Travis tests run. It isn't wrong, just ugly ;) I learned this the same way as @shoyer, by hitting the revert button to see what happened. |
|
OK, I'm going to close and reopen to see if that works on top of current master. |
|
I'm going to go ahead an merge this. The merge should get tested later. |
Revert "DOC: add vstack, hstack, dstack reference to stack documentation."
|
@shoyer Reverted, thanks. |
|
Okay, so to sum up, I think there are two things that the github "Revert" button does that are somewhat annoying:
|
|
@njsmith Ha, I didn't notice the new branch, wondered why I got a commit notice from github. It may be that the reason the tests doubled was that both the branch and the PR were being tested rather than a lack of rolled up commits. |
|
@charris: it could easily be both working together to create a perfect storm of fail: if there were 10 commits being reverted, then travis sees 10 commits in quick sequence to a new branch, starts testing all 10 of them in parallel, and then sees a pull request posted and starts testing that as well. |
Reverts #7191
cc @charris