github fork項目後與原項目進行同步

#fork項目後與原項目進行同步
#首先clone自己
git clone https://github.com/xx.git
#添加遠程倉庫
git remote add username-xx https://github.com/xx.git 
git fetch username-xx
git merge username-xx/master
#如果有衝突則需要手動解決衝突，
git commit -m "merge from username-xx"
git push -u origin master
#查看本地倉庫
git remote -v
git branch -a