Julia Evans on Nostr: are there any tools for resolving git merge conflicts which are different from (and ...
are there any tools for resolving git merge conflicts which are different from (and maybe better than?) the classic 3-column merge tool?
(other than "manually edit the file yourself” obviously)
Published at
2023-12-02 14:19:36Event JSON
{
"id": "f748dec97bba878ef861c40bc171e2016e6c9b992a3635eeadb155e6c21c9550",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1701526776,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111511258808230839",
"activitypub"
]
],
"content": "are there any tools for resolving git merge conflicts which are different from (and maybe better than?) the classic 3-column merge tool?\n\n(other than \"manually edit the file yourself” obviously)\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/111/511/258/510/541/531/original/22176dcffc9c2523.jpeg",
"sig": "88ac87a5adc79c605cb6e7ab97902d3a85eaa7f2e1e7be7770f4498cd065922829e4ba4d4c7311f62ae3189b7ef39c66b155607275a2aecc2f64a3b3941d408f"
}
