Git与Android Studio配合使用
一:安装git
1.1进入官网下载:https://git-scm.com/点击下载


1.2安装成功

二:安装TortoiseGit(可选)
2.1进入官网下载:https://tortoisegit.org/
左下角下载

根据自己的电脑下载

2.2下载完成直接安装

2.3 win10安装遇到的问题

2.3.1解决办法在C:\Windows\System32下面找到"cmd.exe",以管理员身份运行

2.3.2输入安装文件路径,点击下一步安装即可

2.3.3 在桌面点击右键有如下栏目代表安装成功

三:Git与Android Studio配合使用
3.1.与Android Studio关联
3.1.1 打开设置

3.1.2选择"Version Control ",设置自己的git.exe的路径

3.1.3点击"Test",测试关联成功

3.2.创建远程仓库
3.2.1创建"git"仓库

3.2.2定位到自己项目的工作空间下面

观察到项目颜色变化

3.2.3添加忽略文件(下图已安装ignore插件)

3.2.4执行"add"操作

颜色变化,代表可以提交

3.3.提交本地仓库
3.3.1 点击"Commit Directory"

3.3.2.填写提交信息,点击"Commit"

3.3.3填写Name和E-mail

3.3.4提交成功

3.4.提交远程仓库(以"码云"为例)
3.4.1登录进入,点击右边"+"号,选择"新建项目"

3.4.2 填写项目名称(注:项目是否公开可选择,默认为公开)

3.4.3创建成功,点击"复制",复制链接

3.4.4在自己电脑任意文件夹里面右键选择"Git Bash Here"

3.4.5执行"git clone +地址"命令

3.4.6输入账号和密码

3.4.7 clone成功

3.4.8拷贝克隆下来的文件

3.4.9拷贝到自己项目目录下,替换目标文件

3.4.10刷新项目,项目变成红色

3.4.11 重复2.4到3.4重新提交一次,提交到本地

3.4.12提交到远程服务器
3.4.12.1记得要先更新

3.4.12.2再提交

3.4.13选择本地已经提交的

3.4.14提交成功

3.4.1.5进入远程仓库查看,已经有刚刚提交的内容

3.5创建分支
3.5.1查看当前分支

当前分支为:master (一般不在主分支上开发)

3.5.2新建分支

3.5.3输入新建分支的名称

3.5.4提交本地分支到远程服务器
3.5.4.1和提交代码一样,记得提交到本地再更新再提交到远程服务器

3.5.4.2提交成功

3.5.4.3远程服务器查看结果,提交成功.

3.5.5在dev分支下开发

3.5.5.1提交到远程服务器

3.5.5.2在远程服务器查看,在master分支下没有刚刚添加的代码

3.5.5.3在dev分支下,查看到我们刚刚提交的代码

3.5.5.4如果想切换到主(master)分支,按下图操作

3.6冲突的解决
3.6.1制作冲突
3.6.1.1 从git上checkout 作为另外一个项目


3.6.1.2切换到dev分支

3.6.1.3在dev分支下的两个项目下的同一行提交不同的代码(没做截图)
3.6.2 解决冲突
再次更新时就会有冲突,根据具体代码合并冲突

3.7合并分支
3.7.1 把dev合并到master分支,首先切换到master分支,在合并dev分支

3.7.2选择需要合并的分支

3.7.2合并结果
3.7.2.1合并之前主分支结果

3.7.2.2合并之前dev分支结果

3.7.2.3合并之后主分支结果

3.7.2.4合并之后要提交到远程服务器

3.8打Tag
3.8.1打tag的主要目的是为以后恢复做标记

3.8.2填写需要的Tag名称

3.8.3提交tag

3.8.4远程服务器查看tag

3.9取消关联,点击"-"即可
