this post was submitted on 09 Oct 2025
863 points (99.4% liked)

Programmer Humor

26817 readers
3181 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] zalgotext@sh.itjust.works 4 points 1 day ago* (last edited 1 day ago)

Is frequent rebasing something I should push for? A clean history is nice, but I've just won them over on feature branches... Is this something quick and easy that would improve our quality of life?

Realistically, in the short term, no. If neither you nor any of your team members are familiar with rebasing or rebase-based workflows, you will encounter problems that no one will know how to solve without researching. That'll lead to frustration, and before you know it those old school teammates that don't get git will fall back into using svn, or zip files with names like final_project_v1.2_final_final (copy)

I recommend getting familiar with rebase- and merge-based workflows on your own first, like on your own projects/private repos, and reading through the git documentation. Once you become more of an expert, you might be able to teach your teammates how to be proficient at using git, or at bare minimum, you'll be able to help them unfuck themselves when they inevitably fuck their repos up.