Julia Evans on Nostr: a lot of people are saying that they think of branches as being "based" on another ...
a lot of people are saying that they think of branches as being "based" on another branch (often `main`)
and git's terminology supports this idea in a lot of ways -- you have "rebase" (which moves a branch to have a different base) and "merge base"
so intuitively I think it's pretty normal to think of there as being 2 kinds of branches (even if git doesn't represent it that way internally):
- standalone (like `main`)
- offshoots of a standalone branch
(5/?)
Published at
2023-11-21 13:13:05Event JSON
{
"id": "345b3657b588cfa864312747f0e0ed261c88b66486a6179cf7807712b4fb7c55",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1700572385,
"kind": 1,
"tags": [
[
"e",
"6b8fdc5d5aa32982d765bc3167bb3f18a30e744a1e23b35820591288ef62adae",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111448711844617217",
"activitypub"
]
],
"content": "a lot of people are saying that they think of branches as being \"based\" on another branch (often `main`)\n\nand git's terminology supports this idea in a lot of ways -- you have \"rebase\" (which moves a branch to have a different base) and \"merge base\"\n\nso intuitively I think it's pretty normal to think of there as being 2 kinds of branches (even if git doesn't represent it that way internally):\n\n- standalone (like `main`)\n- offshoots of a standalone branch\n\n(5/?)\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/111/448/711/478/459/984/original/1aa565dd75c0dacf.png",
"sig": "3fe5ab13375c022c94e1458d42ca6c888d836e6071042b5603600a2a9c81066a0edc6ebc863e9677213648c137f9349ece192d621512ce4953d740bf08b5fb5c"
}