flatiron/plates — comment on commit 3efdec9d1ba1bb0dbf1c1c43721f65deb4202887
File:  line 0
By jesusabdullah:

I'm almost certain this didn't need to be a merge commit.

## Josh's PROTIPS for avoiding merge commits:

* git pull --rebase remote branch
* git pull --ff-only remote branch
* git checkout -b new-branch && git pull --rebase remote branch && git checkout master && git rebase new-branch

Remember, it's rare that you need a full-on merge, and rebases and fast-forwards leave the cleanest revision histories!