npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) I was going to dispute that, because _technically_ the two sides are symmetric, but on a little reflection I realized you were right—that _is_ how we think of it and talk about it.
Previously I think I would have said that the `main` and `branch` branches in your picture share commits. But I think your description is closer to the way people usually think about it. Rebasing `branch` onto `main` would be routine. Rebasing `main` onto `branch` would be super-weird.
Mark Dominus /
npub1hg…hqfuq
2023-11-21 13:39:33
in reply to nevent1q…4m23
Author Public Key
npub1hgcxucrw7vg0h709590mwsgfjvg0utpvn48nh87u4hsp68jq9rcqehqfuqPublished at
2023-11-21 13:39:33Event JSON
{
"id": "74759dd40afd9af3bf1eb4bb49208f97245ef9514b3a757040f7d250a30faef5",
"pubkey": "ba306e606ef310fbf9e5a15fb741099310fe2c2c9d4f3b9fdcade01d1e4028f0",
"created_at": 1700573973,
"kind": 1,
"tags": [
[
"p",
"e06c1f25be1e23f1c90a88ce823dd8f2a2c167db37cd429ebc5e85c1c8414d0d",
"wss://relay.mostr.pub"
],
[
"p",
"26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"wss://relay.mostr.pub"
],
[
"e",
"345b3657b588cfa864312747f0e0ed261c88b66486a6179cf7807712b4fb7c55",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://mathstodon.xyz/users/mjd/statuses/111448815924547708",
"activitypub"
]
],
"content": "nostr:npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy I was going to dispute that, because _technically_ the two sides are symmetric, but on a little reflection I realized you were right—that _is_ how we think of it and talk about it.\n\nPreviously I think I would have said that the `main` and `branch` branches in your picture share commits. But I think your description is closer to the way people usually think about it. Rebasing `branch` onto `main` would be routine. Rebasing `main` onto `branch` would be super-weird.",
"sig": "446477ba252c5d6f588fbb1408d341dbb6e012c800e20b3dc449cca18e18877a2f7317a351b8fafe7923567e287d40ec8f2d3f6f01410bfe7a407f2630480ccc"
}