NOTICE: master is incorrect atm

[Fishrock123]

Looks like @maclover7 had some trouble landing something and commits back to 64ed366e6fc62af434b28c8b3ebd815e6ba51c69 are not correct atm.

I was in irc with him helping him resolve the land but had to step away and I'm not sure what happened. He doesn't seem to be around anymore.

I have a correct copy up to the commits I landed today (what would supposedly be HEAD atm) I'm going to force push in a few minutes if I don't get a response back from @maclover7 or someone objects.

[apapirovski]

@Fishrock123 Please just force push immediately whatever your latest snapshot is. This looks badly broken. I don't think we want someone continuing to land on top of this already broken state.

[Fishrock123]

Fwiw the commits in question are 2cb9e2a...993b716

[cjihrig]

I just force pushed master. Current head is now 082f952.

[Fishrock123]

I re-added the remaining commits. Current head is now https://github.com/nodejs/node/commits/bb5575aa75fd3071724d5eccde39a3041e1af57a

We are OK now so I'm going to close this.

@maclover7 please reach out if you need assistance. :)

[jasnell]

Thank you for sorting it out.

[maclover7]

I apologize -- this originally started when I was trying to land 18263, and the patch was not applying properly. I decided I would try and merge the PR, and then amend the commit to add the metadata. @Fishrock123 merged his timers PRs at the same time, so there was a conflict. I then amended 18263's commit and added the metadata, and pushed to upstream, but it looks like that made me the committer on all commits from 18263's commit to HEAD.

It turns out, in hindsight, that the change from 18263 had already been applied via 17407 (if you look the same exact commit is there), so 18263 became irrelevant when 17407 was merged. I am sorry for all of the hassle.

[joyeecheung]

@maclover7 Just curious, is this what happened?

Fishrock123> git am the timer PR
Fishrock123> git push to master 

maclover7> git fetch 18263 to a local branch
maclover7> git checkout master
maclover7> git fetch master and update it to where Fishrock123 has pushed
maclover7> git merge 18263
maclover7> ??? something happened that resulted in 2cb9e2a...993b716
maclover7> git commit --amend the message
maclover7> git push to master # where is started to be broken with extra commits

cjihrig > git push --force # to 082f952

Fishrock123> git cherry-pick  082f952...bb5575a
Fishrock123> git push to master # back to normal

I wonder wether a pre-push git hook could help with this...see nodejs/node-core-utils#160 but I am not sure how to reproduce those extra commits.