Git+Vscode+ToroiseGit+码云

深碍√TFBOYSˉ_ 2023-07-22 06:58 17阅读 0赞

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70][]

一、git官网

https://git-scm.com/

二、git小乌龟版

https://tortoisegit.org/download/

下载小乌龟版git和汉化包

三、Git操作一般流程

Git的三个工作区域:工作区、暂存区、历史记录区

1.码云克隆项目至本地:   git  clone

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 1][]

安装好git后，鼠标右键，选择git bash here

git clone https://gitee.com/luyo/blog.git

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 2][]

2.检测代码是否是最新的，与SVN一样，我们遵循先更新再提交原则: git pull

![20200404210838584.png][]

说一个小知识点：如果我们直接在项目里打开Git Bash Here的话，就可以直接进入下面的操作，会在界面上出现（master），表示默认的master分支。

没有的话需要进入项目文件。cd 项目目录（如果在桌面的话，直接cd test进入目录），就会出现（master）了。（如果没有出现，请检查目录是否出错）

先输入命令git pull，他的作用主要在于合并码云上的项目。（因为有时候是团队开发，有可能在你修改完代码之前，别人先修改了一些东西，这个时候你不可能重新去clone一份，效率太慢了）。

如果没有人修改则会提示Already up to date.（表示已经是最新的）。

3.示例使用git提交代码至码云

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 3][]

git status  查看状态

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 4][]

首先将修改的haha.txt文件添加至暂存区（git  add  ）

git add haha.txt

然后就是把暂存区的代码放到仓库中去。使用Git命令：git commit ,

git commit -m "提交haha.txt文件"（后面加-m即对提交的代码添加注释）

![20200404210838702.png][]

最后我们把仓库里的代码放到码云上去 ,使用git命令(git push)

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 5][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 6][]

Vscode中如何使用Git

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 7][]

之前没配置过得老铁需要在setting.json文件进行配置

Ctrl+shift+p,输入setting,可以setting.json文件

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 8][]

Vscode里setting.json文件配置

"workbench.iconTheme": "vscode-icons",

"vsicons.dontShowNewVersionMessage": true,

"\[javascript\]": \{

"editor.defaultFormatter": "vscode.typescript-language-features"

\},

"\[vue\]": \{

"editor.defaultFormatter": "esbenp.prettier-vscode"

\},

"editor.suggestSelection": "first",

"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",

"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx1G -Xms100m -javaagent:\\"C:\\\\Users\\\\Administrator\\\\.vscode\\\\extensions\\\\gabrielbb.vscode-lombok-1.0.1\\\\server\\\\lombok.jar\\"",

//配置本机java安装路径

"java.home": "D:/ServiceFamily/JDK-2019/jdk1.8",

//配置git安装路径

"git.path": "D:/ServiceFamily/Git/git-install/cmd/git.exe",

"terminal.integrated.automationShell.windows": "D:/ServiceFamily/Git/git-install/bin/bash.exe",

//配置本机maven安装路径

"maven.executable.path": "D:/ServiceFamily/apache-maven/apache-maven-3.5.2/bin/mvn",

"java.configuration.maven.userSettings": "D:/ServiceFamily/apache-maven/apache-maven-3.5.2/conf/settings.xml",

"maven.terminal.customEnv": \[

"environmentVariable": "JAVA\_HOME",

"value": "D:/ServiceFamily/JDK-2019/jdk1.8",

\],

"svn.path": "C:/Program Files/TortoiseSVN/bin",

"maven.view": "hierarchical",

"\[plaintext\]": \{

\},

"editor.suggest.snippetsPreventQuickSuggestions": false,

"files.autoGuessEncoding": true,

"code-runner.executorMap": \{

"java": "cd $dir && javac -encoding utf-8 $fileName && java $fileNameWithoutExt"

\},

"code-runner.runInTerminal": true,

//配置新建文件注释和方法注释

"fileheader.configObj": \{

"createFileTime": true,//设置为true则为文件新建时候作为date，否则注释生成时间为date

"autoAdd": false,//自动生成注释，老是忘记的同学可以设置

"annotationStr": \{

"head": "/\*",

"middle": " \* @",

"end": " \*/",

"use": true//设置自定义注释可用

\},

"headInsertLine": \{

"php": 2

\},

"fileheader.cursorMode": \{

"description":"",

"param ":"",

"return":""

\},

"fileheader.customMade": \{

"Description":"" ,//文件内容描述

"Author":"心书",//编辑人

"Date": "Do not edit",//时间

"LastEditTime": "Do not edit",

"LastEditors": "心书",

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 9][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 10][]

![20200404210838583.png][]

现在，我们来启动项目

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 11][]

![20200404210838694.png][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 12][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 13][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 14][]

那我们在vscode里用git提交代码是码云

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 15][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 16][]

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 17][]

========= ===============冲突====================

*  git强制提交本地分支覆盖远程分支

[https://www.cnblogs.com/davidgu/p/9072493.html][https_www.cnblogs.com_davidgu_p_9072493.html]

git push origin master --force

二、git远程仓库强制覆盖本地仓库命令[https://blog.csdn.net/fengqiaoguke/article/details/99817511][https_blog.csdn.net_fengqiaoguke_article_details_99817511]

git强制覆盖命令分解：

git fetch --all

git reset --hard origin/master

git pull

TortoiseGit    [https://www.jb51.net/softjc/711629.html][https_www.jb51.net_softjc_711629.html]

设置记住密码

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 18][]

\[http\]

sslVerify = false

\[credential\]

helper = store

\[user\]

email=你的邮箱

name=你的名字

[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70]: /images/20230528/0716df4b63f84c3f9eff500a696313dc.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 1]: /images/20230528/30c22e09506d4f51929e36509e2a2664.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 2]: /images/20230528/42652a9566d04ba183c403b18302d674.png
[20200404210838584.png]: /images/20230528/c462b88afbe147e0a6e12796ec147a2b.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 3]: /images/20230528/465b2247b5ce41dabe95df8b12c7f858.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 4]: /images/20230528/13831f9324944e48892c685b96c8b06a.png
[20200404210838702.png]: /images/20230528/cc00f94f63bc4b8295477b22cb0b54a1.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 5]: /images/20230528/84a49ac948ae4352920b8e28c583c21e.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 6]: /images/20230528/a37a064208264f0cb7501d2722439a12.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 7]: /images/20230528/b13af821d0bc4a71b8125a1f73945f22.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 8]: /images/20230528/b59d9727e8dd46eb9eb6df9fd4e39bef.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 9]: /images/20230528/a2d50cb71ab84ef2a212a904f880dc34.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 10]: /images/20230528/7b03fcad24054afb9fc7449b72c001db.png
[20200404210838583.png]: /images/20230528/e5d15efd73384e3a874652459afa0d61.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 11]: /images/20230528/c9cf1e5b571a4df885fbedcba8ac9e11.png
[20200404210838694.png]: /images/20230528/ec22297c131e44f08b4d21cf50b30870.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 12]: /images/20230528/0bb6ba2c0340430e8ee2627c2d96b310.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 13]: /images/20230528/788715d50a72490eb6a406b0e16a821f.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 14]: /images/20230528/3bbf1414a27f4843b98b3c68f7794cd4.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 15]: /images/20230528/7aaca592b8804dbbadcf7c25c65b32ed.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 16]: /images/20230528/bc92ebf8213e47d78da242fa5db83939.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 17]: /images/20230528/8ef995a4aa214bb0bc2c77be5ec550d6.png
[https_www.cnblogs.com_davidgu_p_9072493.html]: https://www.cnblogs.com/davidgu/p/9072493.html
[https_blog.csdn.net_fengqiaoguke_article_details_99817511]: https://blog.csdn.net/fengqiaoguke/article/details/99817511
[https_www.jb51.net_softjc_711629.html]: https://www.jb51.net/softjc/711629.html
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MDI4Mzg0Ng_size_16_color_FFFFFF_t_70 18]: /images/20230528/5fda87acbb924931b5f7186848e9baad.png