ChipTuner on Nostr: So it looks like a --no-ff is not what I wanted. It stuffed all of the develop branch ...
So it looks like a --no-ff is not what I wanted. It stuffed all of the develop branch git history into master which it did NOT want :/ Am I using it wrong?
Features are merged into develop, develop is used as a staging branch. I want to keep full develop history. CI tests are run against develop. Once CI tests pass on develop I want to merge changes only (no history) into master. CI is triggered to publish against master, this is a release. Master is merged back into develop to avoid merge conflicts. All feature branches checkout develop not master.
Published at
2024-10-16 00:42:51Event JSON
{
"id": "75a6354a615f95b2fa785e85e520024e8b6960ef0255aa45aae84d6b0e2a655c",
"pubkey": "036533caa872376946d4e4fdea4c1a0441eda38ca2d9d9417bb36006cbaabf58",
"created_at": 1729039371,
"kind": 1,
"tags": [
[
"e",
"891c34bd7ea30f4c71be412125f488722f2abbc4bf97de5a3909934d8d03ba67",
"wss://relay.nostr.band/",
"root"
],
[
"e",
"eb47365889d018055963ec3292cef3972b621639157e14cd170122b9b9f31a66",
"wss://relay.nostr.band/",
"reply"
],
[
"p",
"a008def15796fba9a0d6fab04e8fd57089285d9fd505da5a83fe8aad57a3564d",
"",
"mention"
]
],
"content": "So it looks like a --no-ff is not what I wanted. It stuffed all of the develop branch git history into master which it did NOT want :/ Am I using it wrong?\n\nFeatures are merged into develop, develop is used as a staging branch. I want to keep full develop history. CI tests are run against develop. Once CI tests pass on develop I want to merge changes only (no history) into master. CI is triggered to publish against master, this is a release. Master is merged back into develop to avoid merge conflicts. All feature branches checkout develop not master. ",
"sig": "9afa38b1eba58302e2865b3fd0f08ab32b457fc7e9e7be1a24d05e16ebd3c257fe55198e87fd80f5e33397065cc86196f42cb0a39a9d6bda40e72d187948dee7"
}
