git reset HEAD before git pull
git reset HEAD before git pull

cityindex-attic/wordpress-development-flow,easselin/wordpress-development-flow,cityindex-attic/wordpress-development-flow,cityindex-attic/wordpress-development-flow,easselin/wordpress-development-flow,easselin/wordpress-development-flow,easselin/wordpress-development-flow,cityindex-attic/wordpress-development-flow