search

JMSLab / Template

Template for research repository using scons.
9 stars 1 forks source link

Force squash-merging? #64

Closed jmshapir closed 2 years ago

jmshapir commented 2 years ago

@rcalvo12 @ew487 what would you think about forcing squash-merging as the only way to merge a pull, by unchecking the other options below?

My thinking is that since it's what we require, we might as well enforce it. But let me know if you see any downsides that I'm missing.

If you want to do some testing let me know and I can give you access to this repository which we use for testing workflows.

Thanksl!

image

rcalvo12 commented 2 years ago

@jmshapir, per call with @ew487, we don't see any significant downsides to limiting the merge options to just "squash and merge." In the rare circumstance that a user/lab member thinks that a different type of merge would be more ideal, it is simple enough to just temporarily restore the ability to use that type of merge while closing that issue and turn it back off once the issue is pulled.

jmshapir commented 2 years ago

@rcalvo12 @ew487 settings updated:

image

I will try to execute a pull so we can test it out.

jmshapir commented 2 years ago

Summary: In this issue we decided to enforce squash-merging on pulls. We implemented it and tested it with a pull that entails minor formatting changes to the docs. Changes brought to main in 441c75a.