I installed a fresh copy of Laravel with:
composer create-project --prefer-dist laravel/laravel:5.2.* mylaravelfolder
Then I want to pull a Laravel project I saved in Bitbucket:
cd mylaravelfolder
git init
git remote add origin http://ift.tt/2r9VQLg
git fetch --all
git pull origin master
I get:
error: Untracked working tree file '.env.example' would be overwritten by merge.
I can see the list of untracked files with:
git status
How can I ignore those files and overwrite them with mylaravelproject.git? I read I could do this but wouldn't git add .
mess my mylaravelproject.git on Bitbucket?
git add .
git stash
git pull
via Chebli Mohamed
Aucun commentaire:
Enregistrer un commentaire