What is Nostr?
Julia Evans /
npub1ym9…lm9y
2024-02-26 21:35:14

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.

Author Public Key
npub1ym9ddu2qh7rda8pxklq4gxw2kxhtm4cgvdvdy64z6agwy88nhuhqcnlm9y