1、提交代码:
git status
git commit -m "info"
git push
2、删除本地的分支
git branch -d feature_formvalidate_yld
3、git branch -a
git branch -r
git branch
4、然后再将新的代码重新pull下来 git pull ,可能会提示你配置文件之类的(Your local changes to the following files would be overwritten by merge:.gitignore),这时候我们就要在本地恢复其配置文件
直接 git checkout .gitignore
5、然后git pull(成功)
6、git branch -d feature_formvalidate_yld
git branch
git checkout -b feature_form_bootstrapvalidate
git remote
网友评论