Isn't the 3-Way-Merge just another view on 2 files with the result in the middle?
I cannot imagine a multi-version filemerge with three files and the merge result summary.
At least that's how I understand the official 3-Way-Merge video on their website.
But maybe I didn't understand your use case.
mafe 🇪🇺🇪🇦:golang: :nixos: /
npub1sf…t5syg
2024-08-18 12:59:09
in reply to nevent1q…ymeu
Author Public Key
npub1sf6thg2hcwkcu92yh82cc0qxm9evyh03t96s5vjtt2yld9e87kfq7t5sygPublished at
2024-08-18 12:59:09Event JSON
{
"id": "464d3aca28faeff257d00bc22d622065f1a2bb3633146e6ddde66b172c9ddee0",
"pubkey": "8274bba157c3ad8e1544b9d58c3c06d972c25df159750a324b5a89f69727f592",
"created_at": 1723985949,
"kind": 1,
"tags": [
[
"p",
"4436eaf9e276978c470d299e40555bdb20e12b1270498ea00ff56d46a77a3308"
],
[
"proxy",
"https://layer8.space/@mafe/112983143206032076",
"web"
],
[
"e",
"2cdde38adb2c9d55f364a01925aad3b333813a6802b67d038ca1bfe2ed947f80",
"",
"root",
"35a24436c65472b53fb79079ab56526c98ce6d90552b4f8196a87518a9a61d55"
],
[
"p",
"35a24436c65472b53fb79079ab56526c98ce6d90552b4f8196a87518a9a61d55"
],
[
"proxy",
"https://layer8.space/users/mafe/statuses/112983143206032076",
"activitypub"
],
[
"L",
"pink.momostr"
],
[
"l",
"pink.momostr.activitypub:https://layer8.space/users/mafe/statuses/112983143206032076",
"pink.momostr"
],
[
"-"
]
],
"content": "Isn't the 3-Way-Merge just another view on 2 files with the result in the middle?\n\nI cannot imagine a multi-version filemerge with three files and the merge result summary.\nAt least that's how I understand the official 3-Way-Merge video on their website.\nBut maybe I didn't understand your use case.",
"sig": "be35cf84f496214fc9d191d9d30213d3bef77136d71cb12c886822603f5d4f0da6942fd5e7171de57d4b0df3750bf605654871811ebdd2812407aef92e5d98e4"
}