Event JSON
{
"id": "ed290aa2f871d28e5710d1fcff39dc2072eb41029171ed0a5aa99ec3984f2df2",
"pubkey": "199b11318da351525486f545e71dff0b4c2f2b8a22bb65e44a261da21a8a2488",
"created_at": 1699641150,
"kind": 1,
"tags": [
[
"p",
"e06c1f25be1e23f1c90a88ce823dd8f2a2c167db37cd429ebc5e85c1c8414d0d",
"wss://relay.mostr.pub"
],
[
"p",
"26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"wss://relay.mostr.pub"
],
[
"e",
"9c054df0754fed6c2c979dfa1addac1e66e7f5621e3c1756f4b4adc33b29dbcb",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://fosstodon.org/users/ids1024/statuses/111387682457453367",
"activitypub"
]
],
"content": "nostr:npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy So that's why `git apply` doesn't deal with conflicts the way `git cherry-pick` does?\n\nThough you can use `git apply --reject`. But it works differently.",
"sig": "ed5f5815ebf9b615bf0746b84909757d7be9990a9940c9c8ec7ea02585c10b9a11febdb4e07f24816cb705f0f7d5ae3303c2e5875962cbeaa3b7d47f9fb110ac"
}