What is Nostr?
Julia Evans /
npub1ym9…lm9y
2023-12-14 23:05:08
in reply to nevent1q…tpj4

Julia Evans on Nostr: some confusions folks have mentioned with merge commits so far are: - they make git ...

some confusions folks have mentioned with merge commits so far are:

- they make git bisect more confusing
- unclear how to revert them (you need to `git revert -m 1 COMMIT_ID` or something)
- merges can introduce bugs by accident, even if the code merges cleanly
- they take up space and make it harder to scan for information about the actual code changes
- "backwards" merges make the graph confusing
- it's harder to scan the history by time to identify a recent problem commit

(3/?)
Author Public Key
npub1ym9ddu2qh7rda8pxklq4gxw2kxhtm4cgvdvdy64z6agwy88nhuhqcnlm9y