LeaVerou/animatable — comment on commit 3fa35f718533d34a23275a6b237318fa52fec132
File:  line 0
By bartaz:

Not if you have separate changes in the same line ;)
That's why I always check diff before commit.

Anyway, you can't avoid conflicts in version control, especially distributed version control will lots of social sharing and contributing. Fortunately Git and GitHub make it quite easy to live with that (and fix problems).