Node: merge commit in master branch 7e366b43232814886eecebc054781c7d6c0541ed

[devsnek]

https://github.com/nodejs/node/commit/7e366b43232814886eecebc054781c7d6c0541ed recently appeared

@eugeneo seems to be authored by you?

cc @nodejs/collaborators

[cjihrig]

@devsnek it looks like your commit is the only thing that has landed since the merge commit. I'd personally be OK with rebasing out that merge commit and force pushing.

[sam-github]

@nodejs/collaborators I force-pushed to node/master to remove 2c7aef78c9141dafb9cd74c4a60f7cdaae and the commit that merged it in, 7e366b43232814886eecebc054781c7

Please be aware of this if landing any PRs, so it doesn't come back! Also, maybe force reset your local masters if you happened to have pulled during the 10 or 20 minutes it was there.

See irc logs:

[10:48] <srl295> devsnek: just posting this here to get some eyes, merge commit on master… https://github.com/nodejs/node/issues/27735#issuecomment-493165357
[10:49] <devsnek> I'm mobile atm so I can't rebase it out
[10:50] <octetcloud> I can rebase it out. I assume  that its the `inspector: allow whitelisting inspector domain` that should not be on master?
[10:51] <octetcloud> it doesn't have any PR metadata, so looks like it was pushed by accident, somehow.
[10:51] <devsnek> yeah
[10:53] <Trott> Please force-push out that merge commit.  I know it's been more than 10 minutes, but...yeah...please. 😞
[10:53] <octetcloud> done
[10:53] <devsnek> merge commits? in *my* node.js?
[10:54] <devsnek> thanks octetcloud!

[cjihrig]

Thanks for taking care of this. I'll close the issue out now.

[refack]

P.S. it's possible to turn off merges for the big-green-button and probably reduce the chance of accidents

BTW: rebase-merge could be useful for our workflow (AFAICT it does not change any metadata)

[sam-github]

We don't allow any Green Button merges, do we? Shouldn't all the options should be turned off?

[refack]

We don't allow any Green Button merges, do we? Shouldn't all the options should be turned off?

GitHub doesn't allow that:

so IMH, even if we don't agree that rebase-merging is good, it's probably the lesser evil.

[silverwind]

Is the pull.rebase option still the recommended way to avoid merge commits on the CLI? Maybe should be added to the docs. I have set it globally and never had any issues with it.

[boneskull]

You could add a nonexistent (or never-passing) _required_ build task. That _should_ prevent all merges with green button...

[srl295]

@boneskull i think that can also prevent command line merges also, though. The ICU repo has checks, and command line merges aren't allowed because the checks can't run.

[boneskull]

mm, I think you’re right.