git-rebase

When submitting a pull request to, we ask that you squash your commits before we merge. Assuming that you are in a branch different from develop.

In your terminal, do the following:

Make sure your branch is up to date with the develop branch.
1. git pull origin develop --rebase
Start the rebase
2. git rebase -i develop.
You should see a list of commits, each commit starting with the word "pick".
3. Make sure the first commit says "pick" and change the rest from "pick" to "squash". -- This will squash each commit into the previous commit, which will continue until every commit is squashed into the first commit.
Save and close the editor.

It will pop up another window to give you the opportunity to change the commit message.
Save and close the editor again.
Then you have to force push the final, squashed commit: git push --force.
Squashing commits can be a tricky process but once you figure it out, it's really helpful and keeps our repo concise and clean.