• expr@programming.dev
    link
    fedilink
    arrow-up
    1
    ·
    7 months ago

    Ah gotcha.

    like to rebase after fetching and before pushing. IMO that’s the most sensible way to use it even in teams that generally prefer merge.

    What do you mean? Like not pushing at all until you’re making the MR? Because if the branch has ever been pushed before and you rebase, you’re gonna need to force push the branch to update it.

    Personally I’m constantly rebasing (like many times a day) because I maintain a clean commit history as I develop (small changes to things I did previously get commits and are added to the relevant commit as a fixup during interactive rebasing). I also generally keep a draft MR up with my most recent work (pushing at end of day) so that I can have colleagues take a look at any point if I want to validate anything about the direction I’m taking before continuing further (and so CI can produce various artifacts for me).

    It’s also not obvious to beginners since pull is defaulted to fetch+merge.

    Yeah, pull should definitely be --ff-only by default and it’s very unfortunate it isn’t. Merging on pull is kind of insane behavior that no one actually wants.

    • RecluseRamble@lemmy.dbzer0.com
      link
      fedilink
      arrow-up
      1
      ·
      7 months ago

      What do you mean? Like not pushing at all until you’re making the MR? Because if the branch has ever been pushed before and you rebase, you’re gonna need to force push the branch to update it.

      Not everyone works in large orgs that require pull requests. We have a dev branch multiple devs push to and just branch off for test phase. So I commit locally (also interactive rebasing when fixing stuff from earlier). When I’m ready to push, I fetch, rebase and push. I never force push here.

      • expr@programming.dev
        link
        fedilink
        arrow-up
        1
        ·
        7 months ago

        Uh, it’s definitely a bad idea to be concurrently developing on the same branch for a lot of reasons, large org or not. That’s widely considered a bad practice and is just a recipe for trouble. My org isn’t that huge, and on our team for our repo we have 9 developers working on it including myself. We still do MRs because that’s the industry standard best practice and sidesteps a lot of issues.

        Like, how do you even do reviews? Patch files?