npub1hxqujespmq3rm9qthmery6e8x0hst8mecdlg6wjws5udteh4f5xqg7mxz5 (npub1hxq…mxz5) Oh, yeah. Sorry. It was this: https://www.jetbrains.com/help/phpstorm/resolve-conflicts.html
Since I use the command line mostly, I never see that UI, but you can get it it by right-clicking a conflicted file, choosing to resolve conflicts, and then clicking the Merge button. I had gotten that far before but I didn’t click the Merge button because I didn’t know what it would do. 🤣
Ben Ramsey /
npub1ue…ejs23
2023-08-26 17:26:55
in reply to nevent1q…5594
Author Public Key
npub1uef7kc9jmd0dlyrdx4xzsfdlqz5qm743k9mxektcq524ar7vpkesrejs23Seen on
wss://relay.noswhere.comPublished at
2023-08-26 17:26:55Event JSON
{
"id": "8a4bb72f081a9ab5c9f838c184f88a9e1703122b20e9ee6b295e81f5142294a1",
"pubkey": "e653eb60b2db5edf906d354c2825bf00a80dfab1b1766cd97805155e8fcc0db3",
"created_at": 1693070815,
"kind": 1,
"tags": [
[
"p",
"b981c96601d8223d940bbef2326b2733ef059f79c37e8d3a4e8538d5e6f54d0c",
"wss://relay.mostr.pub"
],
[
"p",
"24107103ee8efd39baf233850149eac1eb0a879ba9a6e1a2293118ad07252c21",
"wss://relay.mostr.pub"
],
[
"e",
"5160f95b807ca8f7bcdecbaa21e84e1373d4830a5fdc614a2710e53b43bf0017",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://phpc.social/users/ramsey/statuses/110957088950722085",
"activitypub"
]
],
"content": "nostr:npub1hxqujespmq3rm9qthmery6e8x0hst8mecdlg6wjws5udteh4f5xqg7mxz5 Oh, yeah. Sorry. It was this: https://www.jetbrains.com/help/phpstorm/resolve-conflicts.html\n\nSince I use the command line mostly, I never see that UI, but you can get it it by right-clicking a conflicted file, choosing to resolve conflicts, and then clicking the Merge button. I had gotten that far before but I didn’t click the Merge button because I didn’t know what it would do. 🤣",
"sig": "f41dc9fac7cba94264731bb680308e88fe396d59b2fbe5ad0a6522496d0a645deb8dada13c0b6512d70a94537f805ae746ca502b3b968ff3b204551982a268ff"
}