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