F04118F@feddit.nl to Programmer Humor@programming.dev · 2 months agoMerge conflictsfeddit.nlimagemessage-square47linkfedilinkarrow-up1512arrow-down15
arrow-up1507arrow-down1imageMerge conflictsfeddit.nlF04118F@feddit.nl to Programmer Humor@programming.dev · 2 months agomessage-square47linkfedilink
minus-squarePattyMcB@lemmy.worldlinkfedilinkarrow-up8arrow-down5·2 months agoMain* branch. Don’t want to sound racist
minus-squareaquovie@lemmy.cafelinkfedilinkEnglisharrow-up10arrow-down1·edit-22 months agoI’ll never understand why we didn’t just go back to saying “trunk”.
minus-squarezarkanian@sh.itjust.workslinkfedilinkarrow-up12·2 months ago“Trunk” is nice because it fits with “branch” in the tree metaphor, but “main” does have fewer letters.
minus-squareLifter@discuss.tchncs.delinkfedilinkarrow-up3·2 months agoYep, the metaphor would be good if git was a tree but kt isn’t. It’s very rare to have a real tree branch merge back into the trunk. Would it even still be called a branch after merging?
Main* branch.
Don’t want to sound racist
I’ll never understand why we didn’t just go back to saying “trunk”.
“Trunk” is nice because it fits with “branch” in the tree metaphor, but “main” does have fewer letters.
Yep, the metaphor would be good if git was a tree but kt isn’t. It’s very rare to have a real tree branch merge back into the trunk. Would it even still be called a branch after merging?