Hi guys! I am working with my fellow students with Laravel. This is our first time using Laravel. We are using GIT (aswell for our firsttime). Every member got his own branch etc.
The problem: whenever I pull the code from another remote branch, I will get a merge conflict. However after manually solving the conflict, (using theirs) , the application doesn't work properply.
The pages aren't showing anything, the Vue template is not working and the data is not shown.
i have tried to run npm install after the merge, composer update aswell, still no luck.
I hope one of you can help me out!