GIT知识点

http://www.jianshu.com/p/d265f7763a3a git中fetch和pull的区别

1. 本地分支重命名

   来源于: http://blog.csdn.net/yy20071313/article/details/49930493 

   1. 本地分支重命名

   Git branch -m oldbranchname newbranchname

   2. 远程分支重命名 (假设本地分支和远程对应分支名称相同)

   a. 重命名远程分支对应的本地分支

   git branch -m old-local-branch-name new-local-branch-name

   b. 删除远程分支

   git push origin  :old-local-branch-name

   c. 上传新命名的本地分支

   git push origin  new-local-branch-name: new-local-branch-name

2. Git Merge Failed: You have not concluded your merge (MERGE_HEAD exists)

   commit&push,不要用merge

3. 待续

gitignore的编写

/bin/

/target/

/test/

*.jar

/.project

/*.classpath

/.settings

/target/

/Servers/

/bin/

/out/

/RemoteSystemsTempFiles/

/.metadata/

/.git/

/.recommenders/

.project

/.settings/

/.gradle/

.settings

.classpath

/.idea/

*.iml

target/