michaelokarimia/battleships — comment on commit 8304fa645c85f32f0eaa3ca83fd50182e7b0e838
File:  line 0
By nieve:

Dude, rebase it, don't merge- esp. when it's a Ffwd