DanConwayDev on Nostr: Ah, you need to use the `--no-ff` flag like so: `git merge --no-ff <branch-name>`
Ah, you need to use the `--no-ff` flag like so: `git merge --no-ff <branch-name>`
DanConwayDev
npub15q…cyejr
2024-09-16 22:08:04
in reply to nevent1q…svg0
Author Public Key
npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejrPublished at
2024-09-16 22:08:04Event JSON
{
"id": "0eba9ed7d0f367ef547fbbd3eb299be3e787bee3e3a331035bf216bdf4cb8239",
"pubkey": "a008def15796fba9a0d6fab04e8fd57089285d9fd505da5a83fe8aad57a3564d",
"created_at": 1726524484,
"kind": 1,
"tags": [
[
"e",
"891c34bd7ea30f4c71be412125f488722f2abbc4bf97de5a3909934d8d03ba67",
"",
"root"
],
[
"e",
"c5079caaba4e2635655df684ae715ff5e860ac054da244c95b5b8fbc31094dc1"
],
[
"e",
"9a91ef334cd9a44274baddcd4138daa62fe567190ea22e118a7760f3b8e9f1c6",
"",
"reply"
],
[
"p",
"a008def15796fba9a0d6fab04e8fd57089285d9fd505da5a83fe8aad57a3564d"
],
[
"p",
"036533caa872376946d4e4fdea4c1a0441eda38ca2d9d9417bb36006cbaabf58"
]
],
"content": "Ah, you need to use the `--no-ff` flag like so: `git merge --no-ff \u003cbranch-name\u003e`",
"sig": "7697d3b81583667dcf26269cffc372c2ab681810beca6f3801d1a8a001b5d200fd749ed368d78d87327747c3180ba89fee1b873d0317dc75e2f6aeb5ccb180e3"
}