Elixir Compiled assets & git conflicts

Which is the best approach to avoid conflicts in git when working with compiled assets?

I'm working with 2 guys in a laravel project and we're using elixir and forge for deployment. Everytime we make a "git pull" git can't merge the compiled assets and we have to amnually re-compile assets, then add those files to stage "git add path/to/all.js, etc" and the manually merge.

Are we making things bad? what is a goo approach to avoid conflicts but not ignoring this compiled files (so we can automatically deploy the entire functional project to forge)

Thanks guys!

eszterczotter

11 years ago

Level 31

I would simply ignore the compiled assets from git. It is generated by a program based on code that is already commited to git. A deploy script can do that, and there is no need to follow the changes in them, since they are already followed in another file.

Please or to participate in this conversation.