git操作

删除

E:projects801parking_mainserver>git rm -r .idea/
rm '.idea/compiler.xml'
rm '.idea/encodings.xml'
rm '.idea/misc.xml'
rm '.idea/vcs.xml'
rm '.idea/workspace.xml'

E:projects801parking_mainserver>git commit -m 删除无关文件
[master 53d66a3] 删除无关文件
 5 files changed, 896 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

E:projects801parking_mainserver>git push
Enumerating objects: 3, done.
Counting objects: 100% (3/3), done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 244 bytes | 244.00 KiB/s, done.
Total 2 (delta 1), reused 0 (delta 0)
To http://36.110.106.242:9090/parking_cloud/parking_mainserver.git
   db6660f..53d66a3  master -> master

多版本

获取远程master分支到本地
git checkout -b 本地没有的分支tmpt origin:master

合并
git merge