• eclectic_electron
    cake
    link
    fedilink
    arrow-up
    2
    ·
    10 months ago

    What’s your workflow that merging into other people’s WIP is normal? I’m so confused

    • steph@lemmy.clueware.org
      link
      fedilink
      arrow-up
      2
      ·
      10 months ago

      A merge from upstream once a day, at the beginning of the day.

      I’m working on a DevOps setting, and even though we’re a small team, we have about two to three changes going through the pipeline a day.

      If you keep your fork too long without syncing, it just get more complicated to merge, and more importantly if you need help from the upstream change author they’ll have moved on to another subject and the change won’t be as fresh in their mind as if you had merged the day after they pushed it.