Set up project to only allow 'Squash and Merge' when merging PRs
slipset opened this issue · comments
This way we avoid merge-conflicts
I assume this refers to turning off "Allow rebase merging" in these settings:
? Or is there more to it than that?
Separately, I'm tempted to turn on branch protection for master, now that the CI pipeline is reasonably robust. wdyt?
Yeah, so I'd uncheck Allow merge commits.
And yes, I'm fine with protecting master branch
Ok stand by...
Done! Let me know if you see anything untoward.