Skip to content

Merge commits on master #19854

Description

@targos

There are two merge commits on master:

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

Activity

  1. apapirovski commented on Apr 6, 2018

    @apapirovski
    Contributor

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

  2. jasnell commented on Apr 6, 2018

    @jasnell
    Member

    @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.

  3. vsemozhetbyt commented on Apr 6, 2018

    @vsemozhetbyt
    Contributor

    Possible ref: #19471

  4. mcollina commented on Apr 6, 2018

    @mcollina
    SponsorMember
  5. jasnell commented on Apr 6, 2018

    @jasnell
    Member

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

  6. added
    metaIssues and PRs related to the general management of the project.
    on Apr 6, 2018
  7. BridgeAR commented on Apr 6, 2018

    @BridgeAR
    Member

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

  8. MylesBorins commented on Apr 6, 2018

    @MylesBorins
    Contributor

    +1 on force push

  9. joyeecheung commented on Apr 6, 2018

    @joyeecheung
    Member

    +1

  10. MylesBorins commented on Apr 6, 2018

    @MylesBorins
    Contributor

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

  11. ofrobots commented on Apr 6, 2018

    @ofrobots
    Contributor

    +1 as well,

  12. addaleax commented on Apr 6, 2018

    @addaleax
    Member

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

  13. gireeshpunathil commented on Apr 7, 2018

    @gireeshpunathil
    Member
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    metaIssues and PRs related to the general management of the project.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions