690
Merge conflicts (feddit.nl)
submitted 1 year ago by to c/programmer_humor@programming.dev
59 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 9 points 1 year ago* (6 children)

I'll never understand why we didn't just go back to saying "trunk".

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 6 child comments
    •
  • [–] 13 points 1 year ago (4 children)

    "Trunk" is nice because it fits with "branch" in the tree metaphor, but "main" does have fewer letters.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 5 points 1 year ago (3 children)

    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?

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 2 points 1 year ago (1 child)

    It's very rare to have a real tree branch merge back into the trunk.

    Not rare, but uncommon. Not sure if there's a Lemmy equivalent but r/treessuckingonthings shows trunks absorbing all sorts of things including branches

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 1 point 1 year ago*

    Yes, this is why I chose not to say that it was impossible.

    Perhaps the mathematical definition of a tree is wrong in stating there should be not loops, or should change to another metaphor.

    Hairs can split but never merges back again. Perhaps a split hair instead of a branch? We still trim or prune the leaves ends. What do you call the "trunk" of a hair?

    Edit: formatting

  • permalink
  • fedilink
  • source
  • parent