Git實踐

1、git 命令

一、當前分支與遠程分支合併

git.exe merge remotes/origin/branch_wjc_gt20151212

二、Git忽略文件

修改.gitignore(Server/GateServer/.settings/*)

git rm -r --cached Server/GateServer/.settings/

git rm -r --cached Server/GateServer/target/

Server/GateServer/.settings/

Server/GateServer/target/

Server/GateServer/.classpath

Server/GateServer/.project

Server/MovieServer/.settings/

Server/MovieServer/target/

Server/MovieServer/.classpath

Server/MovieServer/.project

三、git push

git.exe push --progress "origin" branch_haibing:branch_haibing

四、強制push 

git push --progress "origin" branch_haibing<local>:branch_haibing<remote>

push後在遠程提交覈對

五、

git.exe fetch -v --progress "origin"

git.exe stash save -- "app.properties"

git clone 

六、在分支基礎上建立新的分支 

git.exe checkout -b branch_haibing remotes/origin/branch_haibing 

七、git 管理遠程分支 

建立遠程分支:

git branch develop

git push origin develop

刪除遠程分支：

git push origin :develop

刪除本地分支：

git branch -d branch_wjc

(http://blog.csdn.net/fyh2003/article/details/7528157)

八、git 更新遠程分支

git pull origin branch_haibing

2、代碼合併的過程<TortoiseGit>

一、TortoiseGit --> Fetch...（從遠程倉庫獲取變化，包括新建立的分支和改動）

（fetch or pull change from the other repository.）

二、TortoiseGit --> Merge...

三、選擇要合併的遠程分支

四、若是出現下列問題，按提示提交 

五、合併後出現衝突，解決衝突，

六、對於新增或修改的要肯定是否是本身的修改的代碼，若是不是能夠恢復，若是是可進行提交

七、注意PUSH後的提示，須進行覈對

本地進行代碼合併時注意：

一、清除忽略 

 git rm -r --cached Server/GateServer/.settings/

 git rm -r --cached Server/GateServer/target/

 git rm -r --cached Server/GateServer/.classpath

 git rm -r --cached Server/GateServer/.project

 git rm -r --cached Server/MovieServer/.settings/

 git rm -r --cached Server/MovieServer/target/

 git rm -r --cached Server/MovieServer/.classpath

 git rm -r --cached Server/MovieServer/.project

git fetch 

 hash 值的是顯示最新

---

3、Git參考

一、clone項目地址

git clone https://git.oschina.net/jakei3/HuospkServer.git

二、解決衝突

a、git pull origin

b、git merge origin/branch_zzh

c、TortoiseGit → Edit Conflicts    TortoiseGit → Resolved

（If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.BASE|LOCAL|REMOTE.ext files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolvedcommand, then commit your version.）

d、use TortoiseGit → Resolve..    and commit you change.

三、eclipse插件Egit使用

http://yufenfei.iteye.com/blog/1750124/

四、github配置

https://www.youtube.com/watch?v=pp2S2lHjzZI

https://www.youtube.com/watch?v=fNPLuJTTto0

https://www.youtube.com/watch?v=DQUcmNO4diQ&list=PL30948E8FC6418306

---

4、TortoiseGit

一、HTTPS方式保存密碼最簡單的方法

若是你採用HTTPS方式的話，TortoiseGit在提交時總數會提示你輸入用戶名密碼，很是麻煩。最簡單的解決方案以下：

在TortoiseGit的設置 -> git 中選擇 編輯本地 .git/config 在最後增長下面內容：

[credential]   

     helper = store

---

5、命令更新代碼過程：

一、fetch

git.exe fetch -v --progress "origin"

二、merge

git.exe merge remotes/origin/branch_wjc_gt20151212

三、push

git.exe push --progress "origin" branch_haibing:branch_haibing

git push --progress "origin" master:master

四、git clone

git.exe clone --progress -v "https://git.oschina.net/peter8015/Huospk_Center.git" "E:\Huospk_Center"

git.exe pull -v --progress "origin" branch_haibing

五、 git.exe checkout -b branch_haibing remotes/origin/branch_haibing