Be part of JetBrains PHPverse 2026 on June 9 – a free online event bringing PHP devs worldwide together.

Akcium's avatar

Avoid merging conflicts because of gulp?

Hi there

Do you keep compiled css/js files in git?

I'm tired of getting conflicts in .css/.js files when merging but I'm not sure... should I install npm/bower/gulp on production server and run gulp when I deploy my app and don't keep compiled files in git?

0 likes
1 reply
bobbybouwmann's avatar

Like you said, you can of course run gulp on deployment. This way you can keep it out of version control!

1 like

Please or to participate in this conversation.