• SleeplessCityLights@programming.dev
      link
      fedilink
      arrow-up
      3
      ·
      10 hours ago

      I have made worse, I used to do a cascading merge everyday to move stuff from dev branches to staging to production. Then I did a merge in the opposite direction for a small selection of branches so they could get their updates from staging. Feature branches were rebased as needed.