git merge 步骤 master 到 feature-myAplly-sort-lf-20180709
1、git status 查看状态,是否有未提交文件,若有则提交
直到出现:
On branch feature-myAplly-sort-lf-20180709
Your branch is up to date with 'origin/feature-myAplly-sort-lf-20180709'.
2、git checkout master 切到master
3、git pull 拉取master最新代码
4、git checkout feature-myAplly-sort-lf-20180709
5、git merge master 合并本地master到feature-myAplly-sort-lf-20180709
6、git status 查看状态
7、若有冲突 解决冲突
解决后 记得 git add .一下
8、git commit -a -m "note"
9、git push origin feature-myAplly-sort-lf-20180709
gitlab新建分支查询不到时:
git remote update origin --prune