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/