Utterly terrified going through a sloooow merge process of merging craftxbox (npub1e7y…6a38) patch in and resolving the multitude of conflicts.
trying to figure out why some conflicts just..deleted files that're both still in the .patch source commit AND in HEAD of the working branch. What.
Kay Ohtie 🔜 FWA
npub1zq…9lsst
2025-11-19 03:37:52 UTC
Author Public Key
npub1zqqr926mzhw9c2l5yum4xtrflusrdmt9zfwje4qtw7awrkrz625q99lsstSeen on
wss://relay.momostr.pinkPublished at
2025-11-19 03:37:52 UTCEvent JSON
{
"id": "1c64e1ff530fa5e724fa21d66243d19c7dc39617fca038db1f4920c6cedea1f1",
"pubkey": "100032ab5b15dc5c2bf42737532c69ff2036ed65125d2cd40b77bae1d862d2a8",
"created_at": 1763523472,
"kind": 1,
"tags": [
[
"proxy",
"https://blimps.xyz/@KayOhtie/115574274321176544",
"web"
],
[
"p",
"cf891a2f3a9b2badb0a565717be1ffb7abf58dbefe1c116e8c01c7cbf158caa6"
],
[
"proxy",
"https://blimps.xyz/users/KayOhtie/statuses/115574274321176544",
"activitypub"
],
[
"L",
"pink.momostr"
],
[
"l",
"pink.momostr.activitypub:https://blimps.xyz/users/KayOhtie/statuses/115574274321176544",
"pink.momostr"
],
[
"-"
]
],
"content": "Utterly terrified going through a sloooow merge process of merging nostr:npub1e7y35te6nv46mv99v4chhc0lk74ltrd7lcwpzm5vq8ruhu2ce2nq206a38 patch in and resolving the multitude of conflicts.\n\ntrying to figure out why some conflicts just..deleted files that're both still in the .patch source commit AND in HEAD of the working branch. What.",
"sig": "3478689581de9395d5f9337af9967c9412d3ffe8067b02cdc04f8f26a45ce159c28cd7ef606e4796eb47ed1dd63f703931efe8876aea266b69bb2c7feac9a14f"
}