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.
DanConwayDev
npub15q…cyejr
2024-09-16 19:08:47
in reply to nevent1q…uhzc
Author Public Key
npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejrPublished at
2024-09-16 19:08:47Event JSON
{
"id": "146829aed8292263e42e256ac42034cfd03c316ab158d7a5f2884bd3813cd81d",
"pubkey": "a008def15796fba9a0d6fab04e8fd57089285d9fd505da5a83fe8aad57a3564d",
"created_at": 1726513727,
"kind": 1,
"tags": [
[
"e",
"891c34bd7ea30f4c71be412125f488722f2abbc4bf97de5a3909934d8d03ba67",
"",
"root"
],
[
"p",
"036533caa872376946d4e4fdea4c1a0441eda38ca2d9d9417bb36006cbaabf58"
]
],
"content": "Three options:\n1. No merge - squash the commits in the branch, rebase onto master, set the tip of master to that commit. History is lost.\n2. 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.\n3. Add directly onto master - rebase on master, reset master tip to the tip of your develop branch.\n\nIf you go for option one you could keep a local branch that hasn't been squashed for your own person reference.\n",
"sig": "2f654d6761aa74c1594d5cff6592424797b44de64069fa732065665881584402253b057e91b8c73f08336c5182ee78c465bd40812ec3645dad3237e47f68d26f"
}