search

tetratelabs / tetrate-service-bridge-sandbox

Deploy Tetrate Service Bridge Demo on Azure Kubernetes Service (AKS), Google Kubernetes Engine (GKE) and/or Elastic Kubernetes Service (EKS) using Terraform
Apache License 2.0
12 stars 10 forks source link

Use squash/rebase by default when merging pull requests #229

Closed nacx closed 1 year ago

nacx commented 1 year ago

Merging pull requests without squashing the commits creates a commit history that is hard to understand and reason about, as contains random WIP commits. This makes it harder to start branches from desired commits, etc. The settings of this repo should be changed to prevent merge commits by default and use squash/rebase instead, according to the company-wide engineering guidelines we have in protocol about Git habits.

smarunich commented 1 year ago

can you help @nacx with setting that... I am lacking knowledge on this front...

nacx commented 1 year ago

I'd set this as the only merge option: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests

smarunich commented 1 year ago

ack, I don't have rights on this project. do you? do you see "settings"?

nacx commented 1 year ago

No, we'll need to ask #infosec then.