Julia Evans on Nostr: someone suggested using `git show --remerge-diff` to solve my confusion about merge ...
someone suggested using `git show --remerge-diff` to solve my confusion about merge commits and it seems really good
basically it remerges the two parents and shows the diff between merge commit and what the original merge was (including the merge conflict markers)
here's a screenshot
(3/?)
Published at
2024-02-27 14:18:40Event JSON
{
"id": "fa2a91661cacd3c4b51078bf8230fce2bdee5d1225269c31013ab0a11916dc0d",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1709043520,
"kind": 1,
"tags": [
[
"e",
"fa3e963ef007acb4198cf6279e097800a935a956de1480a80e00fb9cd0dcd0bd",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/112003876158741269",
"activitypub"
]
],
"content": "someone suggested using `git show --remerge-diff` to solve my confusion about merge commits and it seems really good\n\nbasically it remerges the two parents and shows the diff between merge commit and what the original merge was (including the merge conflict markers)\n\nhere's a screenshot\n\n(3/?)\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/112/003/875/859/816/183/original/849048a55b469a17.png",
"sig": "787240ecd5d0d72de36fa5df637072f527a961a2c9663d3136573827a7e236049e090305cd7705cd62c4dcb3d0d80e29fb3d68d43773b7316c9c30965954a699"
}
