Julia Evans on Nostr: i just understood today that the reason I feel stressed out about merge commits is ...
i just understood today that the reason I feel stressed out about merge commits is that you can't figure out the contents of a merge commit by looking at it with `git show`
for example in this screenshot I have two merge commits (`merge1` and `merge2`). They both have the same parents. They display the exact same way with `git show`. But they have different contents.
Published at
2024-02-26 21:35:14Event JSON
{
"id": "06a057a3bf55210d17c878f25b84947631a1ffae0eaa9bb83730fa0c30b16a97",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1708983314,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111999930494157430",
"activitypub"
]
],
"content": "i just understood today that the reason I feel stressed out about merge commits is that you can't figure out the contents of a merge commit by looking at it with `git show`\n\nfor example in this screenshot I have two merge commits (`merge1` and `merge2`). They both have the same parents. They display the exact same way with `git show`. But they have different contents.\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/111/999/930/147/508/928/original/b31370668435f50b.png",
"sig": "bfbd9ad7e4b31359d196ce2fc68e2a90ee60aae3cd61339334a8635132ae4262d647cb700820b49687793dec5986e1b593f8e502ae71f12851e2d7d33ce9438c"
}