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

Sep 24 '19 Comments: 1 Answers: 2

6

I am developing an application using Laravel and vueJs. During build up the application, the npm run watch command watching all relevant files for changes and recompiling app.js when it detects a change. First time, I created a repository (suppose in github/gitlab/bitbucket etc.) with a master branch and two…

Open Full Question