@xmandeng

I too shied away from `git rebase` until stung by a dozen developers continuously merging the latest changes from main into their feature branches. Just wait until someone reverts code ...uhg!!  Realizing I had a "skill issue", I got over my trepidations and invested some time into learning how to use my tools. Now, our team embraces `rebase` and `squash` and life is good.

@lil_pharma

Should dive into more details about the negative consequences of merge commits. That’s what I use, as it is the standard on my team, but it rarely causes issues. I’m not opposed to rebase, I actually like it, but it seems that if you’re taking the “skill issue” approach, it goes both ways. If you can mess them both up, why should I actually consider switching?

@user-if2kq8nh8m

We do rebases but still use merge commits when merging merge requests as our CI workflow depends on merge commit info

@CharlesTheWorldWizard

Rebase is the gigachad way

@gggrkm70

I've watched. and continue to use merge.

@beeforbacon

😥

@MrAlus3

It doesn't make sense in big project casue you just want your commits to main to actually be whole features, not their whole commit history. Rebasing is building garbage with commits unless it's very smal project.

@f0ssig

bootleg dev