I must be dense ... how do I get Kaleidoscope (npub1gsm…j0pw) to do a three-way merge?
I have three files: foo_ancestor.c, foo_descendant1.c and foo_descendant2.c, I can drag them on Kaleidoscope, and they show up at the top of the compare window. One as “A”, one as “B”, and one as nothing. But I can’t find no way to get it to show the 3 pane 3-way-merge UI you get when a Git client opens it.
Uli Kusterer (Not a kitteh)
npub1xk…cjq9y
2024-08-18 12:45:05 UTC
Author Public Key
npub1xk3ygdkx23et20ahjpu6k4jjdjvvumvs2545lqvk4p6332dxr42sdcjq9ySeen on
wss://relay.momostr.pinkPublished at
2024-08-18 12:45:05 UTCEvent JSON
{
"id": "2cdde38adb2c9d55f364a01925aad3b333813a6802b67d038ca1bfe2ed947f80",
"pubkey": "35a24436c65472b53fb79079ab56526c98ce6d90552b4f8196a87518a9a61d55",
"created_at": 1723985105,
"kind": 1,
"tags": [
[
"p",
"4436eaf9e276978c470d299e40555bdb20e12b1270498ea00ff56d46a77a3308"
],
[
"proxy",
"https://chaos.social/@uliwitness/112983087852080793",
"web"
],
[
"proxy",
"https://chaos.social/users/uliwitness/statuses/112983087852080793",
"activitypub"
],
[
"L",
"pink.momostr"
],
[
"l",
"pink.momostr.activitypub:https://chaos.social/users/uliwitness/statuses/112983087852080793",
"pink.momostr"
],
[
"-"
]
],
"content": "I must be dense ... how do I get nostr:npub1gsmw470zw6tcc3cd9x0yq42mmvswz2cjwpycagq074k5dfm6xvyqdmj0pw to do a three-way merge?\n\nI have three files: foo_ancestor.c, foo_descendant1.c and foo_descendant2.c, I can drag them on Kaleidoscope, and they show up at the top of the compare window. One as “A”, one as “B”, and one as nothing. But I can’t find no way to get it to show the 3 pane 3-way-merge UI you get when a Git client opens it.",
"sig": "baf2bfff434b1f41eb1f5d852a76237cc2fedc7e921b074130f35f246fd00bcea89cb2cf7da55ac2327da27a8d57757e0d73137bd33a6851df4a77609f7a23fb"
}