mmall项目中git配置

*.class

#package file
*.war
*.ear

#kdiff3 ignore
*.orig

#maven ignore
out/

#eclipse ignore
.settings/
.project
.classpath

#idea
.idea/
/idea/
*.ipr
*.iml
*.iws

#temp file
*.log
*.cache
*.diff
*.patch
*.tmp

#system ignore
.DS_Store
Thumbs.db

git init
git status

git add .
git status

git commit -am ‘first commit init project’
git remote add origin [email protected]:cgb1804great/mmall_learning.git
git branch

git push -u origin master

第一次git push会出现代码冲突，先执行git pull

当前分支比较落后

git push -u -f origin master

把禁止命令行推送暴露个人邮箱勾选去掉

重新执行git push -u -f origin master

从master拉取分支v1.0

git checkout -b v1.0 origin/master

git push origin HEAD -u