I am sort of new to rebasing and definitely haven't squashed commits before.
While checked out to my local branch called 'whatever', I then do a git add and git commit, then rebase.
I guess this is the right way to rebase or at least one way:
git rebase -i development
development is our mainline branch that we rebase our commits on top of. When I do that command I get:
I have to scroll down to see the latest commits that I just tried to rebase on top of the development branch:
I'm no sure what to do at this point. I've obviously committed my changes, and then did a rebase. Is there a command to squash and what do I squash?? I don't want to squash the entire history of the development branch. Is squash something you do before you rebase? I'm lost a bit.