I'm pretty new to using git, and I wanted to figure out the "best practice" way of setting up a laravel project in my own repo and still be able to fetch updates from the main project (https://github.com/laravel/laravel.git) and merge them with my project?
Could anybody walk me through this with step by step commands?
我会非常感激的.
谢谢!
Laravel default app (https://github.com/laravel/laravel.git) doesn't change much and when it changes, Taylor gives the steps to migrate it. What you really want to do is to keep your project in sync with https://github.com/laravel/framework.git, for that you just have to
composer update
Every day.
But if you really want to have default app in sync too, here are some steps:
1)转到GitHub和Fork https://github.com/laravel/framework.git.
2) Install your application as you would normally:
composer create-project laravel/laravel your-project-name --prefer-dist
3) Rename git origin to anything else:
git remote rename origin laravel
4)在GitHub上创建一个新项目，并将其添加为您的新原点
git remote add origin https://github.com/you/yourproject.git
5) 添加、提交并推送:
git add -A
git commit -m "first commit"
git push origin master
你应该可以走了.
Every time you need to merge yours with Laravel's you'll probably need to:
1) Fetch the changes
git fetch laravel
2) 请查看分支列表:
git branch -va
3) Merge yous with laravel
git merge laravel/master