keeronmarc/brewapp — pull request #5 by Pickra (2013-09-08 14:59:15+00:00)
Title: everything i said in the issue from sept 7, 2013 goes here

so i fixed up my stuff. and copied the whole file elsewhere in case i seriously grokt it up.

then
git add .
git status
git commit

then
git pull origin master
which got this bitchy snark -

CONFLICT (content): Merge conflict in app/scripts/main.js
Automatic merge failed; fix conflicts and then commit the result.

?????
im assumin that has somthn to do w/the fact that joe is also using the default yeoman js file "main.js"? which means i need to rename mine?????

which i didnt figure out till just now. and of course, b4 i had that epiphany, i pusht to my branch. which means i gota do it again?