You do you. People generally discourage rebase because it rewrites history but that’s what you’re doing anyway. You can achieve the same result with revase --interactive and following the instructions to squash all your in progress commits into a single commit. That way you don’t have to figure out how many commits between your in progress and dev(for your reset command) as the rebase will handle it for you.
The benefit with rebase is if you want to have maybe 4 commits insteadd of 10. When reviewing a large pr, I find that it’s helpfull if it’s broken up into a couple of coherent commits so that I can review it commit by commit. It’s easier to follow the logic of why something is being changed if it’s associated with a specific commit.
Sometimes squashing the entire commit is the right choice, in which case you can do what you’re doing or use some built in feature to do that.
I’ve never really needed to use rebase, but my workflow is probably kinda weird:
git checkout -b new_feature_branch, and so move my changes to a different branchgit reset head~10meaning all 10 commits are reverted into staged changesgit push -fthe new commit back to origin (of feature branch)It works pretty well for me, but I was told its weird, and I should rebase instead
You do you. People generally discourage rebase because it rewrites history but that’s what you’re doing anyway. You can achieve the same result with revase --interactive and following the instructions to squash all your in progress commits into a single commit. That way you don’t have to figure out how many commits between your in progress and dev(for your reset command) as the rebase will handle it for you.
The benefit with rebase is if you want to have maybe 4 commits insteadd of 10. When reviewing a large pr, I find that it’s helpfull if it’s broken up into a couple of coherent commits so that I can review it commit by commit. It’s easier to follow the logic of why something is being changed if it’s associated with a specific commit.
Sometimes squashing the entire commit is the right choice, in which case you can do what you’re doing or use some built in feature to do that.