squashing sooo many micros

I had been pushing up a TON of micros and then needed to rebase on top of a dramatically different master.

I found this incredibly useful for getting the rebase done and dealing with the aftermath afterwards..

git rebase -s recursive -X theirs master

will auto rebase on top of master branch all 60+ micro commits, preferring my changes over theirs (the wording of the command seems a little off)
after this, I was able to easily do a
```
git rebase -i master
```
...where I was able to then fixup all my changes on top of the latest master

ruebenramirez / blog