Build files conflict on pull/rebase, sometimes don't make it back into push.

[aeschylus]

When pulling from master, the build files (which the minifier and uglifier place onto a single line) produce conflicts, requiring them to be removed and rebuilt on every pull. Doing this repetitive process manually can sometimes lead to files getting left out of a future push, since they may not have been rebuilt (the codebase can be tested without building the release files). This may lead to intermittent availability of build files for implementers and is generally bad practice.

I suggest several git hooks to make sure to remove the files before pull/fetch begins, and to make sure the project release files are fully built before pushing to a feature branch.