Git与Android Studio配合使用
一:安装git
1.1进入官网下载:https://git-scm.com/点击下载
![](https://img.haomeiwen.com/i3861638/cbcf2c5510effdb5.png)
![](https://img.haomeiwen.com/i3861638/7223fed1237b6509.png)
1.2安装成功
![](https://img.haomeiwen.com/i3861638/8cf2bb60c994d587.png)
二:安装TortoiseGit(可选)
2.1进入官网下载:https://tortoisegit.org/
左下角下载
![](https://img.haomeiwen.com/i3861638/4fb1acda9c474d04.png)
根据自己的电脑下载
![](https://img.haomeiwen.com/i3861638/f32365ce441d5441.png)
2.2下载完成直接安装
![](https://img.haomeiwen.com/i3861638/760b5d3152e59735.png)
2.3 win10安装遇到的问题
![](https://img.haomeiwen.com/i3861638/246a666aa49a840c.png)
2.3.1解决办法在C:\Windows\System32下面找到"cmd.exe",以管理员身份运行
![](https://img.haomeiwen.com/i3861638/2a28ba4dbf37db03.png)
2.3.2输入安装文件路径,点击下一步安装即可
![](https://img.haomeiwen.com/i3861638/f51f450264983d59.png)
2.3.3 在桌面点击右键有如下栏目代表安装成功
![](https://img.haomeiwen.com/i3861638/3062dc729f0892da.png)
三:Git与Android Studio配合使用
3.1.与Android Studio关联
3.1.1 打开设置
![](https://img.haomeiwen.com/i3861638/825d646336e4dbac.png)
3.1.2选择"Version Control ",设置自己的git.exe的路径
![](https://img.haomeiwen.com/i3861638/e3a42e856662e86d.png)
3.1.3点击"Test",测试关联成功
![](https://img.haomeiwen.com/i3861638/81751d48151db298.png)
3.2.创建远程仓库
3.2.1创建"git"仓库
![](https://img.haomeiwen.com/i3861638/257431295f883303.png)
3.2.2定位到自己项目的工作空间下面
![](https://img.haomeiwen.com/i3861638/4d4e7b9571c71c6b.png)
观察到项目颜色变化
![](https://img.haomeiwen.com/i3861638/357f1a7b1be07382.png)
3.2.3添加忽略文件(下图已安装ignore插件)
![](https://img.haomeiwen.com/i3861638/80227a17e9ca2008.png)
3.2.4执行"add"操作
![](https://img.haomeiwen.com/i3861638/99f6e0c990d35f70.png)
颜色变化,代表可以提交
![](https://img.haomeiwen.com/i3861638/51118195046eb072.png)
3.3.提交本地仓库
3.3.1 点击"Commit Directory"
![](https://img.haomeiwen.com/i3861638/d94d42b485904108.png)
3.3.2.填写提交信息,点击"Commit"
![](https://img.haomeiwen.com/i3861638/f40849c0ca244a95.png)
3.3.3填写Name和E-mail
![](https://img.haomeiwen.com/i3861638/2aeaeb3e260bfcce.png)
3.3.4提交成功
![](https://img.haomeiwen.com/i3861638/0ec6a053625ef171.png)
3.4.提交远程仓库(以"码云"为例)
3.4.1登录进入,点击右边"+"号,选择"新建项目"
![](https://img.haomeiwen.com/i3861638/8785278d2d658479.png)
3.4.2 填写项目名称(注:项目是否公开可选择,默认为公开)
![](https://img.haomeiwen.com/i3861638/ec9f24ba87bcb1a3.png)
3.4.3创建成功,点击"复制",复制链接
![](https://img.haomeiwen.com/i3861638/543f000c95662c33.png)
3.4.4在自己电脑任意文件夹里面右键选择"Git Bash Here"
![](https://img.haomeiwen.com/i3861638/6308e28f3091c2b4.png)
3.4.5执行"git clone +地址"命令
![](https://img.haomeiwen.com/i3861638/1220b333293a427c.png)
3.4.6输入账号和密码
![](https://img.haomeiwen.com/i3861638/4b434e3d7a99350c.png)
3.4.7 clone成功
![](https://img.haomeiwen.com/i3861638/ee43ee7f2dfba177.png)
3.4.8拷贝克隆下来的文件
![](https://img.haomeiwen.com/i3861638/ea6fbb916cc0e25b.png)
3.4.9拷贝到自己项目目录下,替换目标文件
![](https://img.haomeiwen.com/i3861638/eed18c2103e9c25a.png)
3.4.10刷新项目,项目变成红色
![](https://img.haomeiwen.com/i3861638/ecca5492fcbf7b1b.png)
3.4.11 重复2.4到3.4重新提交一次,提交到本地
![](https://img.haomeiwen.com/i3861638/7c49c7b71440d236.png)
3.4.12提交到远程服务器
3.4.12.1记得要先更新
![](https://img.haomeiwen.com/i3861638/03b0970b55207ef6.png)
3.4.12.2再提交
![](https://img.haomeiwen.com/i3861638/bbb101440b3032c3.png)
3.4.13选择本地已经提交的
![](https://img.haomeiwen.com/i3861638/aa3caf2607fc1467.png)
3.4.14提交成功
![](https://img.haomeiwen.com/i3861638/18454e59be7dcd9a.png)
3.4.1.5进入远程仓库查看,已经有刚刚提交的内容
![](https://img.haomeiwen.com/i3861638/4c72e034c9d05903.png)
3.5创建分支
3.5.1查看当前分支
![](https://img.haomeiwen.com/i3861638/ae9f5fc694d40789.png)
当前分支为:master (一般不在主分支上开发)
![](https://img.haomeiwen.com/i3861638/6329d7517131993c.png)
3.5.2新建分支
![](https://img.haomeiwen.com/i3861638/7d98001d95c4f498.png)
3.5.3输入新建分支的名称
![](https://img.haomeiwen.com/i3861638/bab66a5d3f6b181a.png)
3.5.4提交本地分支到远程服务器
3.5.4.1和提交代码一样,记得提交到本地再更新再提交到远程服务器
![](https://img.haomeiwen.com/i3861638/b6b46aab8ed83155.png)
3.5.4.2提交成功
![](https://img.haomeiwen.com/i3861638/7ba8362dd436ff0b.png)
3.5.4.3远程服务器查看结果,提交成功.
![](https://img.haomeiwen.com/i3861638/b45c3cd67ca52915.png)
3.5.5在dev分支下开发
![](https://img.haomeiwen.com/i3861638/e6f89c3ebb422ac5.png)
3.5.5.1提交到远程服务器
![](https://img.haomeiwen.com/i3861638/034231090f909e56.png)
3.5.5.2在远程服务器查看,在master分支下没有刚刚添加的代码
![](https://img.haomeiwen.com/i3861638/f00bbb305af143ca.png)
3.5.5.3在dev分支下,查看到我们刚刚提交的代码
![](https://img.haomeiwen.com/i3861638/aa2b78035db6ff40.png)
3.5.5.4如果想切换到主(master)分支,按下图操作
![](https://img.haomeiwen.com/i3861638/63547f473b8e8b1c.png)
3.6冲突的解决
3.6.1制作冲突
3.6.1.1 从git上checkout 作为另外一个项目
![](https://img.haomeiwen.com/i3861638/36e537f849f4487a.png)
![](https://img.haomeiwen.com/i3861638/8f38c9dadf2b2c19.png)
3.6.1.2切换到dev分支
![](https://img.haomeiwen.com/i3861638/879747709b8e1de1.png)
3.6.1.3在dev分支下的两个项目下的同一行提交不同的代码(没做截图)
3.6.2 解决冲突
再次更新时就会有冲突,根据具体代码合并冲突
![](https://img.haomeiwen.com/i3861638/bf372255c01308a3.png)
3.7合并分支
3.7.1 把dev合并到master分支,首先切换到master分支,在合并dev分支
![](https://img.haomeiwen.com/i3861638/da9665e35b8d07b4.png)
3.7.2选择需要合并的分支
![](https://img.haomeiwen.com/i3861638/5fa5299599281810.png)
3.7.2合并结果
3.7.2.1合并之前主分支结果
![](https://img.haomeiwen.com/i3861638/65c16661c1d8e637.png)
3.7.2.2合并之前dev分支结果
![](https://img.haomeiwen.com/i3861638/393522e2917415a2.png)
3.7.2.3合并之后主分支结果
![](https://img.haomeiwen.com/i3861638/7da5aab671c20ebf.png)
3.7.2.4合并之后要提交到远程服务器
![](https://img.haomeiwen.com/i3861638/56a65fd5e4f52b28.png)
3.8打Tag
3.8.1打tag的主要目的是为以后恢复做标记
![](https://img.haomeiwen.com/i3861638/e435dcfa2fbf87ab.png)
3.8.2填写需要的Tag名称
![](https://img.haomeiwen.com/i3861638/98875a9579dce8f4.png)
3.8.3提交tag
![](https://img.haomeiwen.com/i3861638/21048b7b472a2cb1.png)
3.8.4远程服务器查看tag
![](https://img.haomeiwen.com/i3861638/bd1ed395e5d0816b.png)
3.9取消关联,点击"-"即可
![](https://img.haomeiwen.com/i3861638/fa92c2c218853537.png)