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

@pksunkara It's a common `git` workflow to use merge commits to mark places where other branches were merged - but we prefer to not use them at all, whenever possible. Sometimes, though, in the case of conflicts, they can't be avoided.