npub1g4mt97vx7cz267yf7cncc2zs7p6my6yt6kg6heyuc6qpqamtvw2qg7zxup (npub1g4m…zxup) thanks this is a great question, I was just thinking about it today
so far I have
pros of rebase:
- every commit has only one parent so it's always clear what the diff is (vs with merges where the diff feels like a mystery to me)
pros of merge:
- commits never get rewritten
- you never have to force push
I feel like merge vs rebase is mostly a personal preference though
Julia Evans /
npub1ym…nlm9y
2023-10-20 17:39:24
in reply to nevent1q…ck6l
Author Public Key
npub1ym9ddu2qh7rda8pxklq4gxw2kxhtm4cgvdvdy64z6agwy88nhuhqcnlm9yPublished at
2023-10-20 17:39:24Event JSON
{
"id": "d7abb1bda882014af5b5538f53878193b0478a3bf27174b35a7c1f19bbd6b9f1",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1697823564,
"kind": 1,
"tags": [
[
"p",
"4576b2f986f604ad7889f6278c2850f075b2688bd591abe49cc68010776b6394",
"wss://relay.mostr.pub"
],
[
"p",
"6e189043fe53eb7a31d115b9c86c5fde5e7f066e1793e99bbe4f796bbbc79cb2",
"wss://relay.mostr.pub"
],
[
"e",
"bd9a792306c2d0d1c5a599701845f07f11735c7d842c7ec69575cdea0c949dc5",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111268565124055227",
"activitypub"
]
],
"content": "nostr:npub1g4mt97vx7cz267yf7cncc2zs7p6my6yt6kg6heyuc6qpqamtvw2qg7zxup thanks this is a great question, I was just thinking about it today\n\nso far I have\n\npros of rebase:\n- every commit has only one parent so it's always clear what the diff is (vs with merges where the diff feels like a mystery to me)\n\npros of merge:\n- commits never get rewritten\n- you never have to force push\n\nI feel like merge vs rebase is mostly a personal preference though",
"sig": "55320bfb7b56ab5b30b93e0bed4ed7654501c8a88bbbb00a1782cafbd92b50cd8c5c825fc307e0c01dec7be394f22afd73317ee2f7c68d142a075d5a6692291d"
}