Remix.run Logo
tomaytotomato 3 hours ago

Github is not Git but I find the Squash and Merge functionality on Github's Pull Request system means I no longer need to worry about rebasing or squashing my commits locally before rebasing.

At work though it is still encouraged to rebase, and I have sometimes forgotten to squash and then had to abort, or just suck it up and resolve conflicts from my many local commits.

cdmckay 3 hours ago | parent [-]

This

Rebase only makes sense if you making huge PRs where you need to break it down into smaller commits to have them make sense.

If you keep your PRs small, squashing it works well enough, and is far less work and more consistent in teams.

Expecting your team to carefully group their commits and have good commit messages for each is a lot of unnecessary extra work.