• Alien Nathan Edward
    link
    fedilink
    210 months ago

    merge commits that catch my feature branches up to main

    You’d be squashing those when you merge back down into main anyway, no?

    • @scubbo@lemmy.ml
      link
      fedilink
      210 months ago

      You’d hope so - and if one does, I have no concerns about whatever one chooses to do in the privacy of their own branch - but some people insist on directly merging to main (preserving two parallel histories), rather than squashing their change into a single commit. Savages ;)