

1·
14 hours agoIf you are continually rebasing and having to fix the same merge conflict over and over, you should look at https://git-scm.com/book/en/v2/Git-Tools-Rerere
You can also do a git rebase -i
and mark a commit as edit
and git will stop at that commit in the rebase to allow you to stop, look around, and make changes… I think that is what you are looking for
See but you can break the commit back apart by doing a git rebase interactive, selecting that squashed commit as the commit to edit, then doing a
git reset HEAD~1
then recommit it in pieces, thengit rebase --continue
Then
git rebase -i
a second time and then remove the commit that you don’t want to be included