How others are keeping their branches up to date is their problem. If you use Gitlab you can set up squash policy for merge requests. All the abomination they’ve caused in their branch will turn into one nice commit to the main branch.

[–] expr@programming.dev 3 points 7 months ago

I don't want squashed commits. It makes git tools worse (git bisect, git cherry-pick, etc.) and I work very hard to craft a meaningful set of commits for my work and I don't want to throw all of that away.

But yeah, I don't actually give a shit what they are doing on their branches. I regularly rebase onto master anyway.

[–] trxxruraxvr@lemmy.world 1 points 7 months ago

In a small team at a small company it becomes my problem pretty quickly, since I'm the only one that actually has some clue about what git does.