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

iamkarsoft's avatar

Merge Conflict on Forge InertiaJs (vuejs) Laravel App.

I have a laravel app built with Inertiajs and Vuejs on the frontend. 2 environments, Staging on Heroku and Forge for production with GitHub action. When I push code to GitHub, everything works fine and perfectly on Heroku, my frontend assets and js build with no issues, However, on Forge, I tend to get merge conflicts especially manifest, app.js, and css/app.css files in the public folder.

I Will be glad if anyone with experience deploying laravel apps with vue or inertiajs could pinpoint my flaws.

0 likes
3 replies
martinbean's avatar
Level 80

@iamkarsoft If you’re getting merge conflicts on your Forge-managed server then that means your files are being changed on the server and differ from what’s in Git.

Build artefacts like your compiles CSS and JS files, and Mix Manifest file, should be included in your .gitignore file and only generated on build.

iamkarsoft's avatar

Does that mean i should not have i.e: css/ , mix-manifest.json and js/ in my remote github repo?

martinbean's avatar

You shouldn’t be committing them and pushing them to your source repository, no. They’ll get generated when you run Mix when deploying to Heroku or Forge.

Please or to participate in this conversation.