What types of PR merges should we use?

jupyterlab-contrib / jupyterlab-vim

Vim notebook cell bindings for JupyterLab

https://jupyterlab-contrib.github.io/jupyterlab-vim.html

MIT License

661 stars 43 forks source link

What types of PR merges should we use? #59

Closed ianhi closed 2 years ago

ianhi commented 2 years ago

Currently only squash and merge is enabled. I suspect that this was set by either @fcollonval or @axelfahy ? Curious what the reason is - I would prefer to have the option to either squash or to uss a merge commit in order preserve individual commits for later clarity. But don't feel super strongly.

fcollonval commented 2 years ago

I activated the other option. I personally recommend merge & squash as the default to minimize history on the main branch and to ease grasping all changes for a new feature or to fix a bug. But it indeed happen by time to time that keeping some intermediate commit makes sense.