Laravel project in GIT, pull request causing problems
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.
There's really not enough information here for anyone to help you. When you say "manually solving the conflict, (using theirs) " I assume you mean you have their code overwrite yours. At this stage it's not a GIT issue, you would need to troubleshoot like a normal application. I would start with tailing the laravel.log file using something like tail -f storage/logs/laravel.log and see what it's reporting. Sounds like you have some debugging to do.
You may also need to run composer install if your other classmates have different packages installed.
