▲ 299 ▼ Master vs main (again) (lemmy.myserv.one) submitted 1 year ago by Sibshops@lemmy.myserv.one to c/programmer_humor@programming.dev 48 comments fedilink hide all child comments
[–] RickyRigatoni@retrolemmy.com 7 points 1 year ago (6 children) Why not call it trunk and make it all tree themed permalink fedilink source hideshow 6 child comments replies: [–] Sibshops@lemmy.myserv.one [S] 2 points 1 year ago (4 children) Cause git doesn't work that way. There is no trunk. It's all branches. permalink fedilink source parent hideshow 4 child comments replies: [–] RickyRigatoni@retrolemmy.com 8 points 1 year ago (2 children) What is a trunk if not a large branch permalink fedilink source parent hideshow 2 child comments replies: [–] Sibshops@lemmy.myserv.one [S] 5 points 1 year ago* Oh, that's valid, and forks could be called "asexual propagation" Cherry picking from one trunk to another could be called grafting. There is already pruning. If there is no AI used, it could be called GMO. I'm not sure if there is a tree analogy for merging trunks together, however. permalink fedilink source parent [–] DragonTypeWyvern@midwest.social 1 point 1 year ago https://en.m.wikipedia.org/wiki/Branch https://en.m.wikipedia.org/wiki/Trunk_(botany) permalink fedilink source parent [–] BatmanAoD@programming.dev 3 points 1 year ago But that's not actually true in general; there is a default branch concept in forges, and an integration and/or release branch in most recommended workflows. That's the trunk. permalink fedilink source parent [–] dejected_warp_core@lemmy.world 1 point 1 year ago To be completely fair, I've worked in places that treat Git like it's an over-engineered SVN and use the SVN workflow, fighting against the current the entire way. "trunk" would be just fine with that crowd. permalink fedilink source parent
[–] Sibshops@lemmy.myserv.one [S] 2 points 1 year ago (4 children) Cause git doesn't work that way. There is no trunk. It's all branches. permalink fedilink source parent hideshow 4 child comments replies: [–] RickyRigatoni@retrolemmy.com 8 points 1 year ago (2 children) What is a trunk if not a large branch permalink fedilink source parent hideshow 2 child comments replies: [–] Sibshops@lemmy.myserv.one [S] 5 points 1 year ago* Oh, that's valid, and forks could be called "asexual propagation" Cherry picking from one trunk to another could be called grafting. There is already pruning. If there is no AI used, it could be called GMO. I'm not sure if there is a tree analogy for merging trunks together, however. permalink fedilink source parent [–] DragonTypeWyvern@midwest.social 1 point 1 year ago https://en.m.wikipedia.org/wiki/Branch https://en.m.wikipedia.org/wiki/Trunk_(botany) permalink fedilink source parent [–] BatmanAoD@programming.dev 3 points 1 year ago But that's not actually true in general; there is a default branch concept in forges, and an integration and/or release branch in most recommended workflows. That's the trunk. permalink fedilink source parent
[–] RickyRigatoni@retrolemmy.com 8 points 1 year ago (2 children) What is a trunk if not a large branch permalink fedilink source parent hideshow 2 child comments replies: [–] Sibshops@lemmy.myserv.one [S] 5 points 1 year ago* Oh, that's valid, and forks could be called "asexual propagation" Cherry picking from one trunk to another could be called grafting. There is already pruning. If there is no AI used, it could be called GMO. I'm not sure if there is a tree analogy for merging trunks together, however. permalink fedilink source parent [–] DragonTypeWyvern@midwest.social 1 point 1 year ago https://en.m.wikipedia.org/wiki/Branch https://en.m.wikipedia.org/wiki/Trunk_(botany) permalink fedilink source parent
[–] Sibshops@lemmy.myserv.one [S] 5 points 1 year ago* Oh, that's valid, and forks could be called "asexual propagation" Cherry picking from one trunk to another could be called grafting. There is already pruning. If there is no AI used, it could be called GMO. I'm not sure if there is a tree analogy for merging trunks together, however. permalink fedilink source parent
[–] DragonTypeWyvern@midwest.social 1 point 1 year ago https://en.m.wikipedia.org/wiki/Branch https://en.m.wikipedia.org/wiki/Trunk_(botany) permalink fedilink source parent
[–] BatmanAoD@programming.dev 3 points 1 year ago But that's not actually true in general; there is a default branch concept in forges, and an integration and/or release branch in most recommended workflows. That's the trunk. permalink fedilink source parent
[–] dejected_warp_core@lemmy.world 1 point 1 year ago To be completely fair, I've worked in places that treat Git like it's an over-engineered SVN and use the SVN workflow, fighting against the current the entire way. "trunk" would be just fine with that crowd. permalink fedilink source parent