DanConwayDev on Nostr: Three options: 1. No merge - squash the commits in the branch, rebase onto master, ...

Three options:
1. No merge - squash the commits in the branch, rebase onto master, set the tip of master to that commit. History is lost.
2. Merge - don't squash. Merge into master. The CI should just run on the merge commit. This will keep the useful history for future reference for everyone.
3. Add directly onto master - rebase on master, reset master tip to the tip of your develop branch.

If you go for option one you could keep a local branch that hasn't been squashed for your own person reference.