Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Squash merge #263

Closed
jchristgit opened this issue Aug 23, 2024 · 4 comments
Closed

Squash merge #263

jchristgit opened this issue Aug 23, 2024 · 4 comments

Comments

@jchristgit
Copy link
Member

Why do we use squash merge in this repository?

I think we should apply similar strategy that we apply to the infra repository.

@jchristgit
Copy link
Member Author

Any updates?

@jb3
Copy link
Member

jb3 commented Sep 1, 2024

We don't, it appears as the default because it was the last used action and is
the one that's enabled. Nothing here is different to the infra repository.

There is a policy file for ff-bot on main so everything is already setup to be
able to /merge in the same way you would on infra.

PRs #243, #257, #261 and #264 were all merged using the fast-forward bot.

I've disabled all methods but squash merging now because:

  • Merge commits are evil and obviously we have a policy of not using them on
    infra
  • Rebase commits remove signed attestations of commit authority when done via
    GitHub, which rules them out for our use
  • Squash merges, if we were to use a GitHub method, are probably the most useful
    as they retain a GPG attestation from the GitHub Web UI and have a use in
    places.

There is nothing else that needs to be done here for ff-bot to work, it is
already setup and as mentioned is being used.

@jchristgit
Copy link
Member Author

Banks - thanks for the swift response as always, that explains it.

@github-project-automation github-project-automation bot moved this from Up next to Done in Infrastructure Sep 1, 2024
@jb3
Copy link
Member

jb3 commented Sep 1, 2024

Anything for my best-man!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

No branches or pull requests

2 participants