Node: Merge commits on master

[targos]

There are two merge commits on master:

• https://github.com/nodejs/node/commit/1fcf4804d8aa25fa5bc0d333992b6c0dcc52fb72
• https://github.com/nodejs/node/commit/ad445359692ee063454dec035853cf2db7aa491f

I don't know exactly when they were pushed and if it's something that we need to absolutely fix, but something else already landed on top of those.

/cc @nodejs/tsc @gireeshpunathil

[apapirovski]

IMO it should be fixed. This wouldn't be the first time we break the 10 min rule.

[jasnell]

@nodejs/tsc ... how do we want to handle this? We should likely do a revert of those commits at this point. I would say that it's too late to force push.

[vsemozhetbyt]

Possible ref: https://github.com/nodejs/node/pull/19471

[mcollina]

SGTM, let’s do it asap
Il giorno ven 6 apr 2018 alle 18:37 Anatoli Papirovski <
[email protected]> ha scritto:

IMO it should be fixed. This wouldn't be the first time we break the 10
min rule.

—
You are receiving this because you are on a team that was mentioned.
Reply to this email directly, view it on GitHub
https://github.com/nodejs/node/issues/19854#issuecomment-379308273, or mute
the thread
https://github.com/notifications/unsubscribe-auth/AADL49Vcukpvr2-3zZdWrXtTe1FRz3_tks5tl5nMgaJpZM4TKXCc
.

[jasnell]

I'm fine with a force push if other @nodejs/tsc are.

[BridgeAR]

+1 on force pushing. Otherwise we have a weird commit history.

[MylesBorins]

+1 on force push

[joyeecheung]

+1

[MylesBorins]

As an aside I've sent a feature request to github about finding a way to block merge commits from landing on branches

[ofrobots]

+1 as well,

[addaleax]

I've force-pushed, removing the relevant commits.

[gireeshpunathil]

ref: https://github.com/nodejs/node/pull/19471#issuecomment-379425688