DEV Community

Md Rashedul Hasan
Md Rashedul Hasan

Posted on

Answer: app js getting merge conflict when merging branch with master (laravel+vue)

You shouldn't put the compiled files in git, remove the app.js in your public directory from your git repository. Your friend just has to run npm run prod on his machine to get an updated app.js.

Top comments (0)