diff --git a/Sourcetree/Pictures/image-20250716164410111.png b/Sourcetree/Pictures/image-20250716164410111.png new file mode 100644 index 0000000..5ccb55c Binary files /dev/null and b/Sourcetree/Pictures/image-20250716164410111.png differ diff --git a/Sourcetree/Pictures/image-20250716165057657.png b/Sourcetree/Pictures/image-20250716165057657.png new file mode 100644 index 0000000..38f4d19 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716165057657.png differ diff --git a/Sourcetree/Pictures/image-20250716165118877.png b/Sourcetree/Pictures/image-20250716165118877.png new file mode 100644 index 0000000..1dc7ce8 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716165118877.png differ diff --git a/Sourcetree/Pictures/image-20250716165453793.png b/Sourcetree/Pictures/image-20250716165453793.png new file mode 100644 index 0000000..8c2b53f Binary files /dev/null and b/Sourcetree/Pictures/image-20250716165453793.png differ diff --git a/Sourcetree/Pictures/image-20250716165617049.png b/Sourcetree/Pictures/image-20250716165617049.png new file mode 100644 index 0000000..6833fa4 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716165617049.png differ diff --git a/Sourcetree/Pictures/image-20250716165645482.png b/Sourcetree/Pictures/image-20250716165645482.png new file mode 100644 index 0000000..12ee83e Binary files /dev/null and b/Sourcetree/Pictures/image-20250716165645482.png differ diff --git a/Sourcetree/Pictures/image-20250716165820287.png b/Sourcetree/Pictures/image-20250716165820287.png new file mode 100644 index 0000000..e79ee7d Binary files /dev/null and b/Sourcetree/Pictures/image-20250716165820287.png differ diff --git a/Sourcetree/Pictures/image-20250716170022865.png b/Sourcetree/Pictures/image-20250716170022865.png new file mode 100644 index 0000000..40017aa Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170022865.png differ diff --git a/Sourcetree/Pictures/image-20250716170247654.png b/Sourcetree/Pictures/image-20250716170247654.png new file mode 100644 index 0000000..9ca23da Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170247654.png differ diff --git a/Sourcetree/Pictures/image-20250716170317679.png b/Sourcetree/Pictures/image-20250716170317679.png new file mode 100644 index 0000000..d29e9f5 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170317679.png differ diff --git a/Sourcetree/Pictures/image-20250716170352320.png b/Sourcetree/Pictures/image-20250716170352320.png new file mode 100644 index 0000000..3cebc7a Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170352320.png differ diff --git a/Sourcetree/Pictures/image-20250716170805020.png b/Sourcetree/Pictures/image-20250716170805020.png new file mode 100644 index 0000000..3d12572 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170805020.png differ diff --git a/Sourcetree/Pictures/image-20250716170855682.png b/Sourcetree/Pictures/image-20250716170855682.png new file mode 100644 index 0000000..42ad8c0 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170855682.png differ diff --git a/Sourcetree/Pictures/image-20250716170941689.png b/Sourcetree/Pictures/image-20250716170941689.png new file mode 100644 index 0000000..5a137b4 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716170941689.png differ diff --git a/Sourcetree/Pictures/image-20250716173143565.png b/Sourcetree/Pictures/image-20250716173143565.png new file mode 100644 index 0000000..f0356f6 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716173143565.png differ diff --git a/Sourcetree/Pictures/image-20250716173348957.png b/Sourcetree/Pictures/image-20250716173348957.png new file mode 100644 index 0000000..18dff1a Binary files /dev/null and b/Sourcetree/Pictures/image-20250716173348957.png differ diff --git a/Sourcetree/Pictures/image-20250716173441165.png b/Sourcetree/Pictures/image-20250716173441165.png new file mode 100644 index 0000000..d2e9937 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716173441165.png differ diff --git a/Sourcetree/Pictures/image-20250716173550201.png b/Sourcetree/Pictures/image-20250716173550201.png new file mode 100644 index 0000000..2586413 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716173550201.png differ diff --git a/Sourcetree/Pictures/image-20250716173607795.png b/Sourcetree/Pictures/image-20250716173607795.png new file mode 100644 index 0000000..8e7e991 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716173607795.png differ diff --git a/Sourcetree/Pictures/image-20250716174214401.png b/Sourcetree/Pictures/image-20250716174214401.png new file mode 100644 index 0000000..c909a1d Binary files /dev/null and b/Sourcetree/Pictures/image-20250716174214401.png differ diff --git a/Sourcetree/Pictures/image-20250716174617241.png b/Sourcetree/Pictures/image-20250716174617241.png new file mode 100644 index 0000000..77eb8dd Binary files /dev/null and b/Sourcetree/Pictures/image-20250716174617241.png differ diff --git a/Sourcetree/Pictures/image-20250716174648766.png b/Sourcetree/Pictures/image-20250716174648766.png new file mode 100644 index 0000000..7836c34 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716174648766.png differ diff --git a/Sourcetree/Pictures/image-20250716174732231.png b/Sourcetree/Pictures/image-20250716174732231.png new file mode 100644 index 0000000..975e165 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716174732231.png differ diff --git a/Sourcetree/Pictures/image-20250716175122696.png b/Sourcetree/Pictures/image-20250716175122696.png new file mode 100644 index 0000000..7b1f828 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175122696.png differ diff --git a/Sourcetree/Pictures/image-20250716175145263.png b/Sourcetree/Pictures/image-20250716175145263.png new file mode 100644 index 0000000..32fed86 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175145263.png differ diff --git a/Sourcetree/Pictures/image-20250716175417398.png b/Sourcetree/Pictures/image-20250716175417398.png new file mode 100644 index 0000000..27a614f Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175417398.png differ diff --git a/Sourcetree/Pictures/image-20250716175433584.png b/Sourcetree/Pictures/image-20250716175433584.png new file mode 100644 index 0000000..2dc83ed Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175433584.png differ diff --git a/Sourcetree/Pictures/image-20250716175601628.png b/Sourcetree/Pictures/image-20250716175601628.png new file mode 100644 index 0000000..d8b7a6d Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175601628.png differ diff --git a/Sourcetree/Pictures/image-20250716175643864.png b/Sourcetree/Pictures/image-20250716175643864.png new file mode 100644 index 0000000..da26c0f Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175643864.png differ diff --git a/Sourcetree/Pictures/image-20250716175945840.png b/Sourcetree/Pictures/image-20250716175945840.png new file mode 100644 index 0000000..7ce1c1d Binary files /dev/null and b/Sourcetree/Pictures/image-20250716175945840.png differ diff --git a/Sourcetree/Pictures/image-20250716180158270.png b/Sourcetree/Pictures/image-20250716180158270.png new file mode 100644 index 0000000..67f6d78 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716180158270.png differ diff --git a/Sourcetree/Pictures/image-20250716180303985.png b/Sourcetree/Pictures/image-20250716180303985.png new file mode 100644 index 0000000..e4f9b57 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716180303985.png differ diff --git a/Sourcetree/Pictures/image-20250716180604092.png b/Sourcetree/Pictures/image-20250716180604092.png new file mode 100644 index 0000000..c00d366 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716180604092.png differ diff --git a/Sourcetree/Pictures/image-20250716180630542.png b/Sourcetree/Pictures/image-20250716180630542.png new file mode 100644 index 0000000..dcc0aa1 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716180630542.png differ diff --git a/Sourcetree/Pictures/image-20250716180703585.png b/Sourcetree/Pictures/image-20250716180703585.png new file mode 100644 index 0000000..a37eb64 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716180703585.png differ diff --git a/Sourcetree/Pictures/image-20250716180938665.png b/Sourcetree/Pictures/image-20250716180938665.png new file mode 100644 index 0000000..546d8aa Binary files /dev/null and b/Sourcetree/Pictures/image-20250716180938665.png differ diff --git a/Sourcetree/Pictures/image-20250716181021856.png b/Sourcetree/Pictures/image-20250716181021856.png new file mode 100644 index 0000000..e7ba800 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181021856.png differ diff --git a/Sourcetree/Pictures/image-20250716181047357.png b/Sourcetree/Pictures/image-20250716181047357.png new file mode 100644 index 0000000..627de41 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181047357.png differ diff --git a/Sourcetree/Pictures/image-20250716181438836.png b/Sourcetree/Pictures/image-20250716181438836.png new file mode 100644 index 0000000..4df894f Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181438836.png differ diff --git a/Sourcetree/Pictures/image-20250716181454209.png b/Sourcetree/Pictures/image-20250716181454209.png new file mode 100644 index 0000000..1495908 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181454209.png differ diff --git a/Sourcetree/Pictures/image-20250716181509051.png b/Sourcetree/Pictures/image-20250716181509051.png new file mode 100644 index 0000000..44b6c3e Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181509051.png differ diff --git a/Sourcetree/Pictures/image-20250716181532329.png b/Sourcetree/Pictures/image-20250716181532329.png new file mode 100644 index 0000000..1ebd51e Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181532329.png differ diff --git a/Sourcetree/Pictures/image-20250716181710878.png b/Sourcetree/Pictures/image-20250716181710878.png new file mode 100644 index 0000000..354e4e0 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181710878.png differ diff --git a/Sourcetree/Pictures/image-20250716181736718.png b/Sourcetree/Pictures/image-20250716181736718.png new file mode 100644 index 0000000..309cdb9 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181736718.png differ diff --git a/Sourcetree/Pictures/image-20250716181912590.png b/Sourcetree/Pictures/image-20250716181912590.png new file mode 100644 index 0000000..9a3ca90 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716181912590.png differ diff --git a/Sourcetree/Pictures/image-20250716182030610.png b/Sourcetree/Pictures/image-20250716182030610.png new file mode 100644 index 0000000..28266a5 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182030610.png differ diff --git a/Sourcetree/Pictures/image-20250716182040237.png b/Sourcetree/Pictures/image-20250716182040237.png new file mode 100644 index 0000000..9e5035a Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182040237.png differ diff --git a/Sourcetree/Pictures/image-20250716182235209.png b/Sourcetree/Pictures/image-20250716182235209.png new file mode 100644 index 0000000..8ac8ae3 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182235209.png differ diff --git a/Sourcetree/Pictures/image-20250716182311600.png b/Sourcetree/Pictures/image-20250716182311600.png new file mode 100644 index 0000000..f4673e4 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182311600.png differ diff --git a/Sourcetree/Pictures/image-20250716182329851.png b/Sourcetree/Pictures/image-20250716182329851.png new file mode 100644 index 0000000..28e3b0f Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182329851.png differ diff --git a/Sourcetree/Pictures/image-20250716182430546.png b/Sourcetree/Pictures/image-20250716182430546.png new file mode 100644 index 0000000..67434a3 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182430546.png differ diff --git a/Sourcetree/Pictures/image-20250716182440730.png b/Sourcetree/Pictures/image-20250716182440730.png new file mode 100644 index 0000000..67434a3 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182440730.png differ diff --git a/Sourcetree/Pictures/image-20250716182522536.png b/Sourcetree/Pictures/image-20250716182522536.png new file mode 100644 index 0000000..b6eed38 Binary files /dev/null and b/Sourcetree/Pictures/image-20250716182522536.png differ diff --git a/Sourcetree/Sourcetree.md b/Sourcetree/Sourcetree.md index a5f3437..34d8bb5 100644 --- a/Sourcetree/Sourcetree.md +++ b/Sourcetree/Sourcetree.md @@ -76,35 +76,73 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 #### 1.1创建本地仓库 -首先,在电脑上建立一个文件夹,然后在软件内建立本地仓库,目标路径选择需要管理的文件夹路径,创建成功后,就可以对本地仓库进行管理。 +1. 本地建立工作文件夹workpace,并添加1.txt,增加内容为11。(如下图1所示) +2. 打开sourcetree,选择上方加号,选择Create,目标路径选择刚刚建立的文件夹路径,点击创建。即可生成本地仓库。(如下图2、3所示)![image-20250716164410111](./Pictures/image-20250716164410111.png) -image-20250708160913942 +![image-20250716165057657](./Pictures/image-20250716165057657.png) + +![image-20250716165118877](./Pictures/image-20250716165118877.png) #### 1.2打开本地仓库 -仓库创建完成后,在软件上方即可选择刚刚创建的仓库,打开之后,就可以对本地仓库进行管理了。 +1. 选择软件上方菜单栏的加号,页面打开后,选择local本地仓库,即可看到本地所有仓库。(如下图1所示) +2. 选择想要打开的本地仓库,双击即可打开。(如下图2、3所示) + +![image-20250716165453793](./Pictures/image-20250716165453793.png) + +![image-20250716165617049](./Pictures/image-20250716165617049.png) -image-20250708160925365 +![image-20250716165645482](./Pictures/image-20250716165645482.png) #### 1.3克隆远程仓库 -软件新建仓库时选择克隆,将需要克隆的远程仓库链接填入进来,同时选择克隆的路径,确定之后即可将远程仓库克隆到本地。 +1. 选择软件上方菜单栏的加号,页面打开后,选择clone,即可看到克隆仓库。(如下图1所示) +2. 打开远程仓库,找到远程仓库的路径,选择复制。(如下图2所示) +3. 将复制的链接,粘贴到克隆界面的源路径,同时选择本地文件的路径,选择克隆即可。(如下图3所示) +4. 打开文件夹,即可发现远程仓库内容被克隆到本地。(如下图4、5所示) + +![image-20250716165820287](./Pictures/image-20250716165820287.png) + +![image-20250716170022865](./Pictures/image-20250716170022865.png) + +![image-20250716170247654](./Pictures/image-20250716170247654.png) + +![image-20250716170317679](./Pictures/image-20250716170317679.png) + +![image-20250716170352320](./Pictures/image-20250716170352320.png) + +#### 1.4关联远程仓库 + +1. 打开本地仓库界面,选择右上角设置(如下图1所示),出现远程设置(如下图2所示),点击下方添加按钮。 +2. 打开界面后,将远程仓库的链接添加到路径,同时对该远程仓库进行命名。(如下图3所示) +3. 点击确定,即可将本地仓库与远程仓库进行关联。(如下图4所示) -image-20250708160944832 +![image-20250716170805020](./Pictures/image-20250716170805020.png) -#### 1.4获取 +![image-20250716170855682](./Pictures/image-20250716170855682.png) -在软件内找到和远程仓库关联的仓库,选择上方的获取可以获得远程仓库。 +![image-20250716170941689](./Pictures/image-20250716170941689.png) -从远程仓库复制到本地文件,但不会合并。 +![image-20250716173143565](./Pictures/image-20250716173143565.png) -image-20250708161000682 +#### 1.5获取 -#### 1.5关联远程仓库 +1. 选择软件上方菜单栏的获取功能(如下图1所示),弹出获取窗口。(如下图2所示) +2. 点击确定,接口将远程仓库的更新获取到本地仓库中。(如下图3、4所示) -软件内找到设置功能,添加远程仓库,进行关联。 +![image-20250716173348957](./Pictures/image-20250716173348957.png) -image-20250708161023565 +![image-20250716173441165](./Pictures/image-20250716173441165.png) + +![image-20250716173550201](./Pictures/image-20250716173550201.png) + +![image-20250716173607795](./Pictures/image-20250716173607795.png) + +**获取远程仓库时选项介绍:** + +* **从全部远端获取更新:**同时更新所有已配置的远程仓库。 +* **删掉所有远端现已不存在的分支:**清理本地过期的远程分支引用。 +* **获取所有标签:**同步远程仓库的所有标签。 ### 2.节点相关操作 @@ -114,13 +152,13 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 image-20250708161149061 -#### 2.2 重置 +#### 2.2 重置¥ 重置是将本此更改内容取消的操作,本地修改过后,如果在软件的本地仓库内选择重置,则会对本地文件进行版本回退,回到修改前的版本。 image-20250708161204838 -#### 2.3回滚提交 +#### 2.3回滚提交¥ 在提交历史中选择需要回退到的版本,选择回滚提交,则会将版本回退到想要返回的版本。 @@ -138,7 +176,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 ![image-20250716161350905](./Pictures/image-20250716161350905.png) -#### 3.2合并分支 +#### 3.2合并分支¥ 合并分支指将多个分支进行统一,或者将分支的内容同步至其他分支。 @@ -161,7 +199,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 5. 如果有冲突,会提示你处理冲突 6. 处理完冲突后,**提交合并记录** -#### 3.3删除分支 +#### 3.3删除分支¥ 右键选择分支,直接删除即可。 @@ -171,7 +209,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 ![image-20250715131516043](./Pictures/image-20250715131516043.png) -#### 3.4切换分支 +#### 3.4切换分支¥ 直接左侧分支双击即可或者选择检出分支。 @@ -179,13 +217,13 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 -#### 3.5制造冲突 +#### 3.5制造冲突¥ 多个分支修改同一文件,同时将多分支进行合并时,会显示冲突。 ![image-20250715131629820](./Pictures/image-20250715131629820.png) -#### 3.6解决冲突 +#### 3.6解决冲突¥ 1. 可以手动确认选择,同时在提交时右键标记为已解决即可。 @@ -198,13 +236,13 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 1. 使用版本解决冲突,选择使用我的版本或他人版本进行解决。 2. 通过手动更改本地文件进行解决。 -#### 3.7拉取 +#### 3.7拉取¥ 可以将他人传送到云端的内容拉取到自己的设备上面并合并。 image-20250708161333241 -#### 3.8推送 +#### 3.8推送¥ 将本地内容推送到远程仓库。 @@ -212,7 +250,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 ### 4.其他 -#### 4.1书写忽略文件 +#### 4.1书写忽略文件¥ 文件夹内手动添加.gitignore 文件或者点击设置,选择忽略项,可以将不想让仓库追踪的文件写入里面。 @@ -224,7 +262,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 2. **忽略特定类型的文件**:使用通配符后缀,如 `*.md` 表示忽略所有 `.md` 结尾的文件。 3. **忽略特定文件夹**:使用路径方式,如 `/name` 表示忽略项目根目录下的 `name` 文件夹及其所有内容。 -#### 4.2停止跟踪 +#### 4.2停止跟踪¥ 停止跟踪(Stop Tracking)是指将文件从 Git 仓库的版本控制中移除,但不会删除本地文件。这意味着这些文件将不再被 Git 跟踪和管理,但它们仍然保留在你的本地文件系统中。 @@ -234,7 +272,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 也可以在提交时右键提交文件,选择移除。 -#### 4.3创建补丁 +#### 4.3创建补丁¥ 提交列表中找到想要创建补丁的提交,右键即可创建补丁。 @@ -242,7 +280,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 image-20250708161435985 -**应用补丁的四种情况**: +**应用补丁的四种情况**:¥ **1. 分支上的 `1.txt` 内容与补丁内容完全一致** @@ -270,7 +308,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 选择补丁文件,直接右键删除即可。 -#### 4.5贮藏 +#### 4.5贮藏¥ 临时保存未提交的本地修改,让工作区恢复干净。但注意,应添加描述。 @@ -278,7 +316,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 贮藏可以选择暂存器文件,也可以选择非暂存区的文件进行贮藏。 -#### 4.6丢弃 +#### 4.6丢弃¥ 删除未提交的本地修改。 @@ -290,7 +328,7 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 ![image-20250716161244066](./Pictures/image-20250716161244066.png) -#### 4.7创建标签 +#### 4.7创建标签¥ 标记提交。 @@ -320,3 +358,13 @@ Sourcetree 是一款由 Atlassian 开发的免费图形化版本控制客户端 ![image-20250715132733190](./Pictures/image-20250715132733190.png) +#### 4.11新检出远程分支注意 + +当从远程分支上选择检出新分支前,应保证本地不存在不存在存在远程分支跟踪残留。 + +删除本地分支(已跟踪远程分支)后,想要重新检出该远程分支报错解决办法: + +第一,打开资源管理器,选择``.git/refs/remotes/origin/``,找到存在的本地残留,进行删除。 + +第二,重新获取远程分支,然后选择检出远程分支即可。 +