SourceTree管理代码
下载Sourcetree:https://www.sourcetreeapp.com
安装Sourcetree过后会出现下图的界面:
![](https://img.haomeiwen.com/i1534714/fa17637caa821e5b.png)
然后按照图中操作点击账户
![](https://img.haomeiwen.com/i1534714/9ed0221c755973ac.png)
点击账户过后会出现一个弹窗
![](https://img.haomeiwen.com/i1534714/99c8ae3427c36bd9.png)
然后点击添加按钮会再次弹窗如图所示,1、选择你GitHub,如果是其他的就选择其他的,按步骤一步一步走,最后保存
![](https://img.haomeiwen.com/i1534714/14b2bc6b2f4163ae.png)
现在就需要去GitHub上面去创建一个存储库(github访问慢的可以翻墙:https://helloshudong.com)
![](https://img.haomeiwen.com/i1534714/04ae53d0763a4aaa.png)
点击new过后就会走到下一界面,填写Repository name,然后点击Private
![](https://img.haomeiwen.com/i1534714/e674d5e7b4800d51.png)
然后点击Create repository进行创建
![](https://img.haomeiwen.com/i1534714/28e79675a237f3f7.png)
过后就会看到下面图中所示,到这个界面我们就完成了GitHub存储库的创建
![](https://img.haomeiwen.com/i1534714/57d11c6f82d04bf3.png)
现在我们就需要把电脑里面的项目代码上传到这里面来,我们在电脑桌面新建一个文件夹
![](https://img.haomeiwen.com/i1534714/e5bd4245878c3a63.png)
然后把我们的项目拷贝到该文件夹下面如图所示
![](https://img.haomeiwen.com/i1534714/1ba0966508007877.png)
然后打开终端终端,在终端进入到文件夹下(cd /Users/ht/Desktop/Git_Project/ObjectProject)
![](https://img.haomeiwen.com/i1534714/b6e2cdb7fd341230.png)
然后出现上面的情况后继续输入"git init"
![](https://img.haomeiwen.com/i1534714/6ed8f75527fb860b.png)
然后在项目文件夹下面按住“common + shift + .(点)”键就会出现隐藏文件".git"
![](https://img.haomeiwen.com/i1534714/7395a586026d3007.png)
然后继续在终端输入“git add .”然后回车键
![](https://img.haomeiwen.com/i1534714/99abeade6f51e2bc.png)
然后继续输入“git commit -m "提交代码到仓库" ”,然后代码就会出现下图所示
![](https://img.haomeiwen.com/i1534714/4a64c675985251ce.png)
如果出现错误:*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident name (for <>) not allowed
则需要按图中输入
git config --global user.email "GitHub账号@qq.com"
MacBook-Pro ObjectProject % git config --global user.name "GitHub名称"
deMacBook-Pro ObjectProject % git commit -m "提交代码到仓库"
![](https://img.haomeiwen.com/i1534714/db8fb621e61b6cb8.jpg)
当git commit - m "提交代码到仓库"成功过后,在终端输入“git branch -M main”然后回车
![](https://img.haomeiwen.com/i1534714/4a7e2b6cb2da6e32.png)
继续在终端输入“git push -u origin main”后就会出现以下错误
![](https://img.haomeiwen.com/i1534714/0fa404698198c552.png)
所以在终端输入“git remote add origingit@github.com:WanHongYong/MyDemo.git”,然后继续回车输入“git push -u origin main”
![](https://img.haomeiwen.com/i1534714/3fa9aa129a8e0f81.png)
当输入“git push -u origin main”回车过后就会提交代码到GitHub仓库,出现下面的就说明成功了
![](https://img.haomeiwen.com/i1534714/8ff8cae25ac66925.png)
然后我们去GitHub页面刷新就能看到提交的项目代码
![](https://img.haomeiwen.com/i1534714/84fc59b505535c98.png)
如果出现错误就看下面的错误处理,没有就进行sourceTree管理,在SourceTree(1)图中点击本地,然后点击“新建”会弹出下面的弹窗,
![](https://img.haomeiwen.com/i1534714/2f252021eaa7e565.png)
点击“从URL克隆”会出现下面的弹窗
![](https://img.haomeiwen.com/i1534714/6dfddaca923526d2.png)
我们的去GitHub上面找到下面图中页面,复制链接,我们复制的是SSH的,HTTPS的有时候会出现问题
![](https://img.haomeiwen.com/i1534714/a9ccef5860daae12.png)
把复制的链接放到图SourceTree(3)中“源URL”里面,然后会出现下图,然后进行克隆,光标不要放在“源URL”里面
![](https://img.haomeiwen.com/i1534714/abf9ca99c1eb106d.png)
点击克隆过后就会得到项目
![](https://img.haomeiwen.com/i1534714/d1b576a6efc0a98d.png)
双击项目就会出现如图所示:
![](https://img.haomeiwen.com/i1534714/7f9e15e780598bb6.png)
现在我去到项目位置打开项目做如下修改
![](https://img.haomeiwen.com/i1534714/9a9b6c71a8cdffe9.png)
然后再source上面看到文件的更改
![](https://img.haomeiwen.com/i1534714/391c450f1a813aa3.png)
然后我们进行提交内容,安装如图所示
![](https://img.haomeiwen.com/i1534714/77f1a4e5ed7cae05.png)
然后我们在sourcetree的历史哪里就可以看到数据
![](https://img.haomeiwen.com/i1534714/264fe2fb2dab36a7.png)
然后我们在GitHub上面我们也会看到提交的代码数据
![](https://img.haomeiwen.com/i1534714/c266f4bef9388727.png)
然后我们进行创建分支,并把分支提交到GitHub上面
![](https://img.haomeiwen.com/i1534714/bf10209008f84bcc.png)
点击分支会出现下面的弹窗
![](https://img.haomeiwen.com/i1534714/4b872dd9325fc9bc.png)
但是这个分支是本地的,我们需要更新到GitHub上面去点击图中的推送
![](https://img.haomeiwen.com/i1534714/27ce9cf63764dc9a.png)
点击推送过后我们就会看到下面的弹窗
![](https://img.haomeiwen.com/i1534714/4de74515335cf6d2.png)
点击确定过后我们就可以看到下面图中远端和GitHub上面也有了分支
![](https://img.haomeiwen.com/i1534714/d4d8c8f81dd6abcb.png)
![](https://img.haomeiwen.com/i1534714/bcf704b60bd0514a.png)
然后我们在分支代码1上提交,在GitHub上面就可以看到提交的代码
![](https://img.haomeiwen.com/i1534714/8475b37b40ff2b0e.png)
![](https://img.haomeiwen.com/i1534714/419561411ad68c7c.png)
合并代码:首先我们的选中main(主干),然后选择图中的合并
![](https://img.haomeiwen.com/i1534714/19df2d959bcdc970.png)
然后出现合并弹窗的窗口,按照弹窗的提示合并
![](https://img.haomeiwen.com/i1534714/5dee69ca6fc717ac.png)
然后选中推送
![](https://img.haomeiwen.com/i1534714/1a89d30a37e333bb.png)
![](https://img.haomeiwen.com/i1534714/1dcbd2b020f35cbb.png)
然后我们就会在 GitHub上面看到我们合并过后的代码
![](https://img.haomeiwen.com/i1534714/fcd880516560c76f.png)
错误处理:还有一种情况是,这个时候我们就会从新生成key
![](https://img.haomeiwen.com/i1534714/da6c4d9b64be631d.png)
在终端输入“ssh-keygen -t rsa -C "GitHub账号”
![](https://img.haomeiwen.com/i1534714/6c073a501961fd0b.png)
然后出现如下图所示,说明生成成功
![](https://img.haomeiwen.com/i1534714/694db247a7cdaa08.png)
然后去到图中的文件,打开图中.pub文件,用文本打开
![](https://img.haomeiwen.com/i1534714/adeec38755c02e56.png)
打开文件就会看到如图所示,然后全部复制从“ssh -> com”结束
![](https://img.haomeiwen.com/i1534714/99fc1f01bb43f8e5.png)
复制成功过后然后到GitHub页面按顺序点击
![](https://img.haomeiwen.com/i1534714/f9c6f2edbe9c6e77.png)
点击Deploy keys过后会出现下图所示,然后点击“Add deploy key”
![](https://img.haomeiwen.com/i1534714/23c77a9b9657b7de.png)
点击过后会出现下图,按照图中所示进行填写,填写过后,然后再进行代码提交“git push -u origin main”
![](https://img.haomeiwen.com/i1534714/ca49503cae4d932e.png)