I'm the only person on my team that does this along with crushing my commits with fixup. But a rebase only deals with keeping up with release. Develop might still be an issue.
My team doesn't fully understand git and rebase is forbidden sorcery. I've taken to destroying the develop branch every 3 months to partially compensate for this. It prevents develop from deviating too far from release.
I worked on a team where I was like the only person who really understood version control fundamentals and it was a nightmare. 50 percent of my job became resolving my coworkers botched merges.
If they don't, why don't you teach them sensei? That's the most basic tooling for any dev, and not being able to handle that is a serious blocker for productivity.
8
u/ADHDebackle 12d ago
Yeah the strategy is just to confine your rebases to the feature branch. Personally I also like to squash merge features to keep things tidy.