git更新文件并上传到gitlab
git上传文件报错如下:
- remote: Please merge origin/master before push to remote!
- ! [remote rejected] fy_dev -> fy_dev (pre-receive hook declined)
解决方法:本地mast需要同步更新与gitlab上master保持一致后,其他分支才能上传修改
一、本地文件更新到最新
git pull
git pull origin master
二、修改本地文件后查看修改
git status
On branch fy_dev
Your branch is up to date with 'origin/fy_dev'