[{"data":1,"prerenderedAt":1634},["ShallowReactive",2],{"wiki-page-/wiki/2023-12-29-git-jiao-xue/ch2-git-shi-cao":3,"wiki-doc-items-/wiki/2023-12-29-git-jiao-xue/ch2-git-shi-cao":1610},{"id":4,"title":5,"body":6,"chapter":1595,"chapterSort":1596,"date":1597,"description":29,"docKey":1598,"docRoot":1599,"docTitle":1600,"extension":1601,"isWikiDoc":1602,"isWikiIndex":1603,"layout":1604,"meta":1605,"navigation":1602,"path":1606,"seo":1607,"stem":1608,"wikiDepth":37,"__hash__":1609},"content/wiki/2023-12-29-Git教学/ch2-Git实操.md","Git实操",{"type":7,"value":8,"toc":1590},"minimark",[9,13,23,72,79,82,87,110,115,119,154,158,170,175,179,197,202,205,237,242,245,250,253,258,261,266,269,281,286,289,292,295,309,314,317,345,350,353,365,370,379,383,420,425,430,433,444,475,480,485,490,507,512,517,520,528,548,553,572,577,589,594,597,603,634,639,645,669,674,680,698,703,706,712,733,738,744,761,766,769,774,802,807,812,817,836,841,846,871,876,881,884,889,911,916,921,926,956,961,966,971,984,989,992,996,1010,1015,1020,1025,1030,1033,1038,1041,1046,1051,1056,1059,1064,1069,1074,1079,1112,1117,1120,1128,1133,1152,1157,1162,1167,1172,1187,1192,1197,1209,1214,1217,1225,1230,1235,1238,1241,1246,1249,1254,1259,1264,1267,1273,1278,1284,1296,1301,1307,1327,1332,1338,1350,1355,1361,1371,1376,1380,1384,1387,1391,1397,1401,1408,1412,1417,1420,1425,1430,1434,1439,1444,1447,1451,1456,1460,1465,1468,1472,1477,1480,1484,1489,1494,1497,1502,1505,1509,1514,1517,1522,1525,1530,1535,1537,1542,1547,1552,1556,1561,1566,1571,1576,1581,1586],[10,11,12],"h3",{"id":12},"环境准备",[14,15,16,20],"ol",{},[17,18,19],"li",{},"操作系统: Linux,Windows,MacOS(本文以Linux为教程)",[17,21,22],{},"安装Git",[24,25,30],"pre",{"className":26,"code":27,"language":28,"meta":29,"style":29},"language-bash shiki shiki-themes github-light github-dark","sudo apt-get update\nsudo apt-get install git\ngit --version\n","bash","",[31,32,33,49,62],"code",{"__ignoreMap":29},[34,35,38,42,46],"span",{"class":36,"line":37},"line",1,[34,39,41],{"class":40},"sScJk","sudo",[34,43,45],{"class":44},"sZZnC"," apt-get",[34,47,48],{"class":44}," update\n",[34,50,52,54,56,59],{"class":36,"line":51},2,[34,53,41],{"class":40},[34,55,45],{"class":44},[34,57,58],{"class":44}," install",[34,60,61],{"class":44}," git\n",[34,63,65,68],{"class":36,"line":64},3,[34,66,67],{"class":40},"git",[34,69,71],{"class":70},"sj4cs"," --version\n",[73,74,75],"p",{},[76,77],"img",{"alt":29,"src":78},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image2.webp",[10,80,81],{"id":81},"常用指令介绍",[83,84,86],"h4",{"id":85},"linux创建目录并进入目录","Linux创建目录&&并进入目录",[24,88,90],{"className":26,"code":89,"language":28,"meta":29,"style":29},"mkdir -p hellogit\ncd hellogit\n",[31,91,92,103],{"__ignoreMap":29},[34,93,94,97,100],{"class":36,"line":37},[34,95,96],{"class":40},"mkdir",[34,98,99],{"class":70}," -p",[34,101,102],{"class":44}," hellogit\n",[34,104,105,108],{"class":36,"line":51},[34,106,107],{"class":70},"cd",[34,109,102],{"class":44},[73,111,112],{},[76,113],{"alt":29,"src":114},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image3.webp",[83,116,118],{"id":117},"设置git的用户与邮箱必须设置","设置git的用户与邮箱(必须设置！！！)",[24,120,122],{"className":26,"code":121,"language":28,"meta":29,"style":29},"git config --global user.name \"tungchiahui\"\ngit config --global user.email tungchiahui@gmail.com\n",[31,123,124,140],{"__ignoreMap":29},[34,125,126,128,131,134,137],{"class":36,"line":37},[34,127,67],{"class":40},[34,129,130],{"class":44}," config",[34,132,133],{"class":70}," --global",[34,135,136],{"class":44}," user.name",[34,138,139],{"class":44}," \"tungchiahui\"\n",[34,141,142,144,146,148,151],{"class":36,"line":51},[34,143,67],{"class":40},[34,145,130],{"class":44},[34,147,133],{"class":70},[34,149,150],{"class":44}," user.email",[34,152,153],{"class":44}," tungchiahui@gmail.com\n",[83,155,157],{"id":156},"git初始化使该文件夹被git控制","git初始化(使该文件夹被git控制)",[24,159,161],{"className":26,"code":160,"language":28,"meta":29,"style":29},"git init\n",[31,162,163],{"__ignoreMap":29},[34,164,165,167],{"class":36,"line":37},[34,166,67],{"class":40},[34,168,169],{"class":44}," init\n",[73,171,172],{},[76,173],{"alt":29,"src":174},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image4.webp",[83,176,178],{"id":177},"创建文件查看当前文件夹内的所有文件","创建文件&&查看当前文件夹内的所有文件",[24,180,182],{"className":26,"code":181,"language":28,"meta":29,"style":29},"touch test.md\nls\n",[31,183,184,192],{"__ignoreMap":29},[34,185,186,189],{"class":36,"line":37},[34,187,188],{"class":40},"touch",[34,190,191],{"class":44}," test.md\n",[34,193,194],{"class":36,"line":51},[34,195,196],{"class":40},"ls\n",[73,198,199],{},[76,200],{"alt":29,"src":201},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image5.webp",[83,203,204],{"id":204},"编辑文件文本内容",[24,206,208],{"className":26,"code":207,"language":28,"meta":29,"style":29},"sudo apt-get update\nsudo apt-get install vim\nvim ./test.md\n",[31,209,210,218,229],{"__ignoreMap":29},[34,211,212,214,216],{"class":36,"line":37},[34,213,41],{"class":40},[34,215,45],{"class":44},[34,217,48],{"class":44},[34,219,220,222,224,226],{"class":36,"line":51},[34,221,41],{"class":40},[34,223,45],{"class":44},[34,225,58],{"class":44},[34,227,228],{"class":44}," vim\n",[34,230,231,234],{"class":36,"line":64},[34,232,233],{"class":40},"vim",[34,235,236],{"class":44}," ./test.md\n",[73,238,239],{},[76,240],{"alt":29,"src":241},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image6.webp",[73,243,244],{},"接下来按键盘上的insert按键进入编辑模式&&并输入一段文本",[73,246,247],{},[76,248],{"alt":29,"src":249},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image7.webp",[73,251,252],{},"按ESC退出编辑模式",[73,254,255],{},[76,256],{"alt":29,"src":257},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image8.webp",[73,259,260],{},"按shift+冒号按键，并输入wq回车进行保存退出",[73,262,263],{},[76,264],{"alt":29,"src":265},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image9.webp",[83,267,268],{"id":268},"查询当前文件的状态",[24,270,272],{"className":26,"code":271,"language":28,"meta":29,"style":29},"git status\n",[31,273,274],{"__ignoreMap":29},[34,275,276,278],{"class":36,"line":37},[34,277,67],{"class":40},[34,279,280],{"class":44}," status\n",[73,282,283],{},[76,284],{"alt":29,"src":285},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image10.webp",[73,287,288],{},"On branch 分支名",[73,290,291],{},"Untracked是指文件在工作区",[83,293,294],{"id":294},"将文件提交到暂存区",[24,296,298],{"className":26,"code":297,"language":28,"meta":29,"style":29},"git add test.md\n",[31,299,300],{"__ignoreMap":29},[34,301,302,304,307],{"class":36,"line":37},[34,303,67],{"class":40},[34,305,306],{"class":44}," add",[34,308,191],{"class":44},[73,310,311],{},[76,312],{"alt":29,"src":313},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image11.webp",[83,315,316],{"id":316},"将文件提交至本地仓库",[24,318,320],{"className":26,"code":319,"language":28,"meta":29,"style":29},"git commit -m \"version1\"  \n#git commit -m \"提交的信息(可以理解为是注释)\"\n",[31,321,322,339],{"__ignoreMap":29},[34,323,324,326,329,332,335],{"class":36,"line":37},[34,325,67],{"class":40},[34,327,328],{"class":44}," commit",[34,330,331],{"class":70}," -m",[34,333,334],{"class":44}," \"version1\"",[34,336,338],{"class":337},"sVt8B","  \n",[34,340,341],{"class":36,"line":51},[34,342,344],{"class":343},"sJ8bj","#git commit -m \"提交的信息(可以理解为是注释)\"\n",[73,346,347],{},[76,348],{"alt":29,"src":349},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image12.webp",[83,351,352],{"id":352},"查看已经提交的项目版本",[24,354,356],{"className":26,"code":355,"language":28,"meta":29,"style":29},"git log\n",[31,357,358],{"__ignoreMap":29},[34,359,360,362],{"class":36,"line":37},[34,361,67],{"class":40},[34,363,364],{"class":44}," log\n",[73,366,367],{},[76,368],{"alt":29,"src":369},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image13.webp",[73,371,372,373,378],{},"这几行的意思是tungchiahui(邮箱为",[374,375,377],"a",{"href":376},"mailto:tungchiahui@gmail.com","tungchiahui@gmail.com",")用户于2023年12月30日周六00:42:47往master分支提交了注解为\"version1\"的项目版本",[83,380,382],{"id":381},"可以尝试对文件内容进行修改并再次进行提交","可以尝试对文件内容进行修改，并再次进行提交",[24,384,386],{"className":26,"code":385,"language":28,"meta":29,"style":29},"vim test.md\ngit add test.md\ngit commit -m \"version2\"\ngit log\n",[31,387,388,394,402,413],{"__ignoreMap":29},[34,389,390,392],{"class":36,"line":37},[34,391,233],{"class":40},[34,393,191],{"class":44},[34,395,396,398,400],{"class":36,"line":51},[34,397,67],{"class":40},[34,399,306],{"class":44},[34,401,191],{"class":44},[34,403,404,406,408,410],{"class":36,"line":64},[34,405,67],{"class":40},[34,407,328],{"class":44},[34,409,331],{"class":70},[34,411,412],{"class":44}," \"version2\"\n",[34,414,416,418],{"class":36,"line":415},4,[34,417,67],{"class":40},[34,419,364],{"class":44},[73,421,422],{},[76,423],{"alt":29,"src":424},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image14.webp",[73,426,427],{},[76,428],{"alt":29,"src":429},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image15.webp",[83,431,432],{"id":432},"如何忽略掉不想提交的文件",[14,434,435,438,441],{},[17,436,437],{},"首先创建一个文件.gitignore",[17,439,440],{},"再创建一个文件 绝密文件不想开源.py 并修改里面的内容",[17,442,443],{},"查看git状态",[24,445,447],{"className":26,"code":446,"language":28,"meta":29,"style":29},"touch .gitignore\ntouch vinci_secret.py\nvim vinci_secret.py\ngit status\n",[31,448,449,456,463,469],{"__ignoreMap":29},[34,450,451,453],{"class":36,"line":37},[34,452,188],{"class":40},[34,454,455],{"class":44}," .gitignore\n",[34,457,458,460],{"class":36,"line":51},[34,459,188],{"class":40},[34,461,462],{"class":44}," vinci_secret.py\n",[34,464,465,467],{"class":36,"line":64},[34,466,233],{"class":40},[34,468,462],{"class":44},[34,470,471,473],{"class":36,"line":415},[34,472,67],{"class":40},[34,474,280],{"class":44},[73,476,477],{},[76,478],{"alt":29,"src":479},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image16.webp",[73,481,482],{},[76,483],{"alt":29,"src":484},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image17.webp",[14,486,487],{"start":415},[17,488,489],{},"修改.gitignore的内容，将不想被提交的文件名写入该文件",[24,491,493],{"className":26,"code":492,"language":28,"meta":29,"style":29},"vim .gitignore\ngit status\n",[31,494,495,501],{"__ignoreMap":29},[34,496,497,499],{"class":36,"line":37},[34,498,233],{"class":40},[34,500,455],{"class":44},[34,502,503,505],{"class":36,"line":51},[34,504,67],{"class":40},[34,506,280],{"class":44},[73,508,509],{},[76,510],{"alt":29,"src":511},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image18.webp",[73,513,514],{},[76,515],{"alt":29,"src":516},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image19.webp",[83,518,519],{"id":519},"分支基本操作",[14,521,522,525],{},[17,523,524],{},"分支的作用:开辟项目的一个新仓库分支，与master等其他分支是独立的，可以进行独立的add、commit和diff、clone。",[17,526,527],{},"创建分支",[24,529,531],{"className":26,"code":530,"language":28,"meta":29,"style":29},"git branch route2\n#git branch 分支名\n",[31,532,533,543],{"__ignoreMap":29},[34,534,535,537,540],{"class":36,"line":37},[34,536,67],{"class":40},[34,538,539],{"class":44}," branch",[34,541,542],{"class":44}," route2\n",[34,544,545],{"class":36,"line":51},[34,546,547],{"class":343},"#git branch 分支名\n",[14,549,550],{"start":64},[17,551,552],{},"进入分支",[24,554,556],{"className":26,"code":555,"language":28,"meta":29,"style":29},"git checkout route2\n#git checkout 分支名\n",[31,557,558,567],{"__ignoreMap":29},[34,559,560,562,565],{"class":36,"line":37},[34,561,67],{"class":40},[34,563,564],{"class":44}," checkout",[34,566,542],{"class":44},[34,568,569],{"class":36,"line":51},[34,570,571],{"class":343},"#git checkout 分支名\n",[14,573,574],{"start":415},[17,575,576],{},"查询有多少分支，并查询目前为哪一个分支",[24,578,580],{"className":26,"code":579,"language":28,"meta":29,"style":29},"git branch\n",[31,581,582],{"__ignoreMap":29},[34,583,584,586],{"class":36,"line":37},[34,585,67],{"class":40},[34,587,588],{"class":44}," branch\n",[73,590,591],{},[76,592],{"alt":29,"src":593},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image20.webp",[73,595,596],{},"当前分支文件会完美继承master分支的文件",[14,598,600],{"start":599},5,[17,601,602],{},"删除掉该分支下的文件",[24,604,606],{"className":26,"code":605,"language":28,"meta":29,"style":29},"ls\nrm -rf test.md\nrm -rf vinci_secret.py\nls\n",[31,607,608,612,622,630],{"__ignoreMap":29},[34,609,610],{"class":36,"line":37},[34,611,196],{"class":40},[34,613,614,617,620],{"class":36,"line":51},[34,615,616],{"class":40},"rm",[34,618,619],{"class":70}," -rf",[34,621,191],{"class":44},[34,623,624,626,628],{"class":36,"line":64},[34,625,616],{"class":40},[34,627,619],{"class":70},[34,629,462],{"class":44},[34,631,632],{"class":36,"line":415},[34,633,196],{"class":40},[73,635,636],{},[76,637],{"alt":29,"src":638},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image21.webp",[14,640,642],{"start":641},6,[17,643,644],{},"将该分支往本地仓库进行提交",[24,646,648],{"className":26,"code":647,"language":28,"meta":29,"style":29},"git commit -a -m \"删库跑路\"\n#该指令是把git add和git commit指令一起写\n",[31,649,650,664],{"__ignoreMap":29},[34,651,652,654,656,659,661],{"class":36,"line":37},[34,653,67],{"class":40},[34,655,328],{"class":44},[34,657,658],{"class":70}," -a",[34,660,331],{"class":70},[34,662,663],{"class":44}," \"删库跑路\"\n",[34,665,666],{"class":36,"line":51},[34,667,668],{"class":343},"#该指令是把git add和git commit指令一起写\n",[73,670,671],{},[76,672],{"alt":29,"src":673},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image22.webp",[14,675,677],{"start":676},7,[17,678,679],{},"查看分支是否对其他分支有影响(切换到其他分支查看影响)",[24,681,683],{"className":26,"code":682,"language":28,"meta":29,"style":29},"git checkout master\nls\n",[31,684,685,694],{"__ignoreMap":29},[34,686,687,689,691],{"class":36,"line":37},[34,688,67],{"class":40},[34,690,564],{"class":44},[34,692,693],{"class":44}," master\n",[34,695,696],{"class":36,"line":51},[34,697,196],{"class":40},[73,699,700],{},[76,701],{"alt":29,"src":702},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image23.webp",[73,704,705],{},"可以发现，在route2分支中被删掉的test.md文件回来了，但是同样被删掉的vinci_sercet.py文件没回来，是因为该文件在提交时被.gitignore文件屏蔽了，不会被提交到本地仓库",[14,707,709],{"start":708},8,[17,710,711],{},"删除分支",[24,713,715],{"className":26,"code":714,"language":28,"meta":29,"style":29},"git branch -D route2\n#git branch -D 分支名\n",[31,716,717,728],{"__ignoreMap":29},[34,718,719,721,723,726],{"class":36,"line":37},[34,720,67],{"class":40},[34,722,539],{"class":44},[34,724,725],{"class":70}," -D",[34,727,542],{"class":44},[34,729,730],{"class":36,"line":51},[34,731,732],{"class":343},"#git branch -D 分支名\n",[73,734,735],{},[76,736],{"alt":29,"src":737},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image24.webp",[14,739,741],{"start":740},9,[17,742,743],{},"创建分支并立马切换到分支",[24,745,747],{"className":26,"code":746,"language":28,"meta":29,"style":29},"git checkout -b route3\n",[31,748,749],{"__ignoreMap":29},[34,750,751,753,755,758],{"class":36,"line":37},[34,752,67],{"class":40},[34,754,564],{"class":44},[34,756,757],{"class":70}," -b",[34,759,760],{"class":44}," route3\n",[73,762,763],{},[76,764],{"alt":29,"src":765},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image25.webp",[83,767,768],{"id":768},"分支的合并",[14,770,771],{},[17,772,773],{},"在route3分支中修改文件内容并提交",[24,775,777],{"className":26,"code":776,"language":28,"meta":29,"style":29},"vim test.md\ngit commit -am \"route3 version3\"\n#-a -m也可以被省略成-am\n",[31,778,779,785,797],{"__ignoreMap":29},[34,780,781,783],{"class":36,"line":37},[34,782,233],{"class":40},[34,784,191],{"class":44},[34,786,787,789,791,794],{"class":36,"line":51},[34,788,67],{"class":40},[34,790,328],{"class":44},[34,792,793],{"class":70}," -am",[34,795,796],{"class":44}," \"route3 version3\"\n",[34,798,799],{"class":36,"line":64},[34,800,801],{"class":343},"#-a -m也可以被省略成-am\n",[73,803,804],{},[76,805],{"alt":29,"src":806},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image26.webp",[73,808,809],{},[76,810],{"alt":29,"src":811},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image27.webp",[14,813,814],{"start":51},[17,815,816],{},"切换到master分支",[24,818,820],{"className":26,"code":819,"language":28,"meta":29,"style":29},"git checkout master\nvim test.md\n",[31,821,822,830],{"__ignoreMap":29},[34,823,824,826,828],{"class":36,"line":37},[34,825,67],{"class":40},[34,827,564],{"class":44},[34,829,693],{"class":44},[34,831,832,834],{"class":36,"line":51},[34,833,233],{"class":40},[34,835,191],{"class":44},[73,837,838],{},[76,839],{"alt":29,"src":840},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image28.webp",[14,842,843],{"start":64},[17,844,845],{},"将route3分支合并到当前分支上",[24,847,849],{"className":26,"code":848,"language":28,"meta":29,"style":29},"git merge route3\n#git merge 被合并的分支名\nvim test.md\n",[31,850,851,860,865],{"__ignoreMap":29},[34,852,853,855,858],{"class":36,"line":37},[34,854,67],{"class":40},[34,856,857],{"class":44}," merge",[34,859,760],{"class":44},[34,861,862],{"class":36,"line":51},[34,863,864],{"class":343},"#git merge 被合并的分支名\n",[34,866,867,869],{"class":36,"line":64},[34,868,233],{"class":40},[34,870,191],{"class":44},[73,872,873],{},[76,874],{"alt":29,"src":875},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image29.webp",[73,877,878],{},[76,879],{"alt":29,"src":880},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image30.webp",[83,882,883],{"id":883},"分支合并的冲突",[14,885,886],{},[17,887,888],{},"为master添加一行内容，并提交",[24,890,892],{"className":26,"code":891,"language":28,"meta":29,"style":29},"vim test.md\ngit commit -am \"master version4\"\n",[31,893,894,900],{"__ignoreMap":29},[34,895,896,898],{"class":36,"line":37},[34,897,233],{"class":40},[34,899,191],{"class":44},[34,901,902,904,906,908],{"class":36,"line":51},[34,903,67],{"class":40},[34,905,328],{"class":44},[34,907,793],{"class":70},[34,909,910],{"class":44}," \"master version4\"\n",[73,912,913],{},[76,914],{"alt":29,"src":915},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image31.webp",[73,917,918],{},[76,919],{"alt":29,"src":920},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image32.webp",[14,922,923],{"start":51},[17,924,925],{},"切换到route3分支，并添加内容并提交",[24,927,929],{"className":26,"code":928,"language":28,"meta":29,"style":29},"git checkout route3\nvim test.md\ngit commit -am \"route3 version4\"\n",[31,930,931,939,945],{"__ignoreMap":29},[34,932,933,935,937],{"class":36,"line":37},[34,934,67],{"class":40},[34,936,564],{"class":44},[34,938,760],{"class":44},[34,940,941,943],{"class":36,"line":51},[34,942,233],{"class":40},[34,944,191],{"class":44},[34,946,947,949,951,953],{"class":36,"line":64},[34,948,67],{"class":40},[34,950,328],{"class":44},[34,952,793],{"class":70},[34,954,955],{"class":44}," \"route3 version4\"\n",[73,957,958],{},[76,959],{"alt":29,"src":960},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image33.webp",[73,962,963],{},[76,964],{"alt":29,"src":965},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image34.webp",[14,967,968],{"start":64},[17,969,970],{},"合并分支",[24,972,974],{"className":26,"code":973,"language":28,"meta":29,"style":29},"git merge master\n",[31,975,976],{"__ignoreMap":29},[34,977,978,980,982],{"class":36,"line":37},[34,979,67],{"class":40},[34,981,857],{"class":44},[34,983,693],{"class":44},[73,985,986],{},[76,987],{"alt":29,"src":988},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image35.webp",[73,990,991],{},"发生了内容冲突，需要手动修改文本冲突才可以！或者其他办法也可以解决，可以查询百度。",[83,993,995],{"id":994},"远程仓库github","远程仓库Github",[14,997,998,1007],{},[17,999,1000,1001],{},"打开github官网：",[374,1002,1006],{"href":1003,"rel":1004},"https://github.com(%E5%A6%82%E6%9E%9C%E4%BD%A0%E6%89%93%E4%B8%8D%E5%BC%80%EF%BC%8C%E8%AF%B7%E8%87%AA%E5%B7%B1%E6%89%BE%E5%8A%9E%E6%B3%95%E6%89%93%E5%BC%80)",[1005],"nofollow","https://github.com(如果你打不开，请自己找办法打开)",[17,1008,1009],{},"注册并登录账号",[73,1011,1012],{},[76,1013],{"alt":29,"src":1014},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image36.webp",[14,1016,1017],{"start":64},[17,1018,1019],{},"新建远程仓库",[73,1021,1022],{},[76,1023],{"alt":29,"src":1024},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image37.webp",[73,1026,1027],{},[76,1028],{"alt":29,"src":1029},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image38.webp",[73,1031,1032],{},"这个界面建议详细设置一下，但这里是演示，所以只设置了仓库名称，其他选项为默认操作。",[73,1034,1035],{},[76,1036],{"alt":29,"src":1037},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image39.webp",[73,1039,1040],{},"如果上图出现，则说明已经创建成功了",[14,1042,1043],{"start":415},[17,1044,1045],{},"进行创建文件并提交",[73,1047,1048],{},[76,1049],{"alt":29,"src":1050},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image40.webp",[73,1052,1053],{},[76,1054],{"alt":29,"src":1055},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image41.webp",[73,1057,1058],{},"填写好文件名，文件内容，就可以点绿色按钮进行提交了。然后也可以填写提交的注释信息。",[73,1060,1061],{},[76,1062],{"alt":29,"src":1063},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image42.webp",[73,1065,1066],{},[76,1067],{"alt":29,"src":1068},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image43.webp",[14,1070,1071],{"start":599},[17,1072,1073],{},"克隆远程仓库到本地",[73,1075,1076],{},[76,1077],{"alt":29,"src":1078},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image44.webp",[24,1080,1082],{"className":26,"code":1081,"language":28,"meta":29,"style":29},"cd\nmkdir repo_floder\ncd repo_floder\ngit clone https://github.com/tungchiahui/test_repo.git\n",[31,1083,1084,1089,1096,1102],{"__ignoreMap":29},[34,1085,1086],{"class":36,"line":37},[34,1087,1088],{"class":70},"cd\n",[34,1090,1091,1093],{"class":36,"line":51},[34,1092,96],{"class":40},[34,1094,1095],{"class":44}," repo_floder\n",[34,1097,1098,1100],{"class":36,"line":64},[34,1099,107],{"class":70},[34,1101,1095],{"class":44},[34,1103,1104,1106,1109],{"class":36,"line":415},[34,1105,67],{"class":40},[34,1107,1108],{"class":44}," clone",[34,1110,1111],{"class":44}," https://github.com/tungchiahui/test_repo.git\n",[73,1113,1114],{},[76,1115],{"alt":29,"src":1116},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image45.webp",[73,1118,1119],{},"如果出错，请检查是否能正常访问github！",[73,1121,1122,1125],{},[76,1123],{"alt":29,"src":1124},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image46.webp",[76,1126],{"alt":29,"src":1127},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image47.webp",[14,1129,1130],{"start":641},[17,1131,1132],{},"对文件内容进行修改",[24,1134,1136],{"className":26,"code":1135,"language":28,"meta":29,"style":29},"cd test_repo\nvim test1.md\n",[31,1137,1138,1145],{"__ignoreMap":29},[34,1139,1140,1142],{"class":36,"line":37},[34,1141,107],{"class":70},[34,1143,1144],{"class":44}," test_repo\n",[34,1146,1147,1149],{"class":36,"line":51},[34,1148,233],{"class":40},[34,1150,1151],{"class":44}," test1.md\n",[73,1153,1154],{},[76,1155],{"alt":29,"src":1156},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image48.webp",[73,1158,1159],{},[76,1160],{"alt":29,"src":1161},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image49.webp",[73,1163,1164],{},[76,1165],{"alt":29,"src":1166},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image50.webp",[14,1168,1169],{"start":676},[17,1170,1171],{},"查看该本地仓库与哪些远程仓库有联系",[24,1173,1175],{"className":26,"code":1174,"language":28,"meta":29,"style":29},"git remote -v\n",[31,1176,1177],{"__ignoreMap":29},[34,1178,1179,1181,1184],{"class":36,"line":37},[34,1180,67],{"class":40},[34,1182,1183],{"class":44}," remote",[34,1185,1186],{"class":70}," -v\n",[73,1188,1189],{},[76,1190],{"alt":29,"src":1191},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image51.webp",[14,1193,1194],{"start":708},[17,1195,1196],{},"将本地仓库push到远程仓库",[24,1198,1200],{"className":26,"code":1199,"language":28,"meta":29,"style":29},"git push\n",[31,1201,1202],{"__ignoreMap":29},[34,1203,1204,1206],{"class":36,"line":37},[34,1205,67],{"class":40},[34,1207,1208],{"class":44}," push\n",[73,1210,1211],{},[76,1212],{"alt":29,"src":1213},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image52.webp",[73,1215,1216],{},"这里需要你输入github的用户名与密码，用户名则为github用户名，但是密码则为github用户token，生成token的步骤如下：",[73,1218,1219,1222],{},[76,1220],{"alt":29,"src":1221},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image53.webp",[76,1223],{"alt":29,"src":1224},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image54.webp",[73,1226,1227],{},[76,1228],{"alt":29,"src":1229},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image55.webp",[73,1231,1232],{},[76,1233],{"alt":29,"src":1234},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image56.webp",[73,1236,1237],{},"Note随便填，有效日期选择没有截止时间。",[73,1239,1240],{},"下面能勾的勾全勾上，这是权限。",[73,1242,1243],{},[76,1244],{"alt":29,"src":1245},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image57.webp",[73,1247,1248],{},"复制token并填入password中(token在终端中输入会被隐藏，输完直接回车即可)",[73,1250,1251],{},[76,1252],{"alt":29,"src":1253},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image58.webp",[14,1255,1256],{"start":740},[17,1257,1258],{},"查看远程仓库",[73,1260,1261],{},[76,1262],{"alt":29,"src":1263},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image59.webp",[73,1265,1266],{},"发现文件已经被修改了！",[14,1268,1270],{"start":1269},10,[17,1271,1272],{},"对远程仓库内容进行修改",[73,1274,1275],{},[76,1276],{"alt":29,"src":1277},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image60.webp",[14,1279,1281],{"start":1280},11,[17,1282,1283],{},"将远程仓库内容拉到本地仓库",[24,1285,1287],{"className":26,"code":1286,"language":28,"meta":29,"style":29},"git fetch\n",[31,1288,1289],{"__ignoreMap":29},[34,1290,1291,1293],{"class":36,"line":37},[34,1292,67],{"class":40},[34,1294,1295],{"class":44}," fetch\n",[73,1297,1298],{},[76,1299],{"alt":29,"src":1300},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image61.webp",[14,1302,1304],{"start":1303},12,[17,1305,1306],{},"查看本地与远程仓库区别",[24,1308,1310],{"className":26,"code":1309,"language":28,"meta":29,"style":29},"git diff origin/main\n#git diff 远程仓库名/分支名\n",[31,1311,1312,1322],{"__ignoreMap":29},[34,1313,1314,1316,1319],{"class":36,"line":37},[34,1315,67],{"class":40},[34,1317,1318],{"class":44}," diff",[34,1320,1321],{"class":44}," origin/main\n",[34,1323,1324],{"class":36,"line":51},[34,1325,1326],{"class":343},"#git diff 远程仓库名/分支名\n",[73,1328,1329],{},[76,1330],{"alt":29,"src":1331},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image62.webp",[14,1333,1335],{"start":1334},13,[17,1336,1337],{},"如果发现内容没问题，就可以将远程仓库内容同步到工作区",[24,1339,1341],{"className":26,"code":1340,"language":28,"meta":29,"style":29},"git pull\n",[31,1342,1343],{"__ignoreMap":29},[34,1344,1345,1347],{"class":36,"line":37},[34,1346,67],{"class":40},[34,1348,1349],{"class":44}," pull\n",[73,1351,1352],{},[76,1353],{"alt":29,"src":1354},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image63.webp",[14,1356,1358],{"start":1357},14,[17,1359,1360],{},"查看项目修改历史",[24,1362,1363],{"className":26,"code":355,"language":28,"meta":29,"style":29},[31,1364,1365],{"__ignoreMap":29},[34,1366,1367,1369],{"class":36,"line":37},[34,1368,67],{"class":40},[34,1370,364],{"class":44},[73,1372,1373],{},[76,1374],{"alt":29,"src":1375},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image64.webp",[10,1377,1379],{"id":1378},"vscode-git","VScode + Git",[83,1381,1383],{"id":1382},"vscode是什么","VScode是什么？",[73,1385,1386],{},"VScode是一个文本编辑器，类似于Vim等编辑器，但是他有图形界面，有非常多的好用的插件，而且可以集成编译器环境，最终也可以被用户自定义配置成Visual Studio那样的IDE。",[83,1388,1390],{"id":1389},"vscode官网","VScode官网:",[73,1392,1393],{},[374,1394,1395],{"href":1395,"rel":1396},"https://code.visualstudio.com/",[1005],[83,1398,1400],{"id":1399},"linux环境下配置c环境教程","Linux环境下配置C++环境教程:",[73,1402,1403],{},[374,1404,1407],{"href":1405,"rel":1406},"https://sdutvincirobot.feishu.cn/docx/ANgFdRtvKoCcKDxZ2ehc5Rocnwh",[1005],"Linux C++编译环境配置",[83,1409,1411],{"id":1410},"创建文件夹并在该文件夹下打开vscode","创建文件夹并在该文件夹下打开VScode",[73,1413,1414],{},[76,1415],{"alt":29,"src":1416},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image65.webp",[83,1418,1419],{"id":1419},"新建文件",[73,1421,1422],{},[76,1423],{"alt":29,"src":1424},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image66.webp",[73,1426,1427],{},[76,1428],{"alt":29,"src":1429},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image67.webp",[83,1431,1433],{"id":1432},"初始化git类似于git-init命令","初始化Git(类似于git init命令)",[73,1435,1436],{},[76,1437],{"alt":29,"src":1438},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image68.webp",[73,1440,1441],{},[76,1442],{"alt":29,"src":1443},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image69.webp",[73,1445,1446],{},"U是指未追踪状态，也就是文件还在工作区",[83,1448,1450],{"id":1449},"将文件提交到暂存区类似git-add","将文件提交到暂存区(类似git add)",[73,1452,1453],{},[76,1454],{"alt":29,"src":1455},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image70.webp",[83,1457,1459],{"id":1458},"取消提交到暂存区点减号这里不取消","取消提交到暂存区点减号(这里不取消)",[73,1461,1462],{},[76,1463],{"alt":29,"src":1464},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image71.webp",[73,1466,1467],{},"A是added表示在暂存区",[83,1469,1471],{"id":1470},"进行提交类似于commit","进行提交(类似于commit)",[73,1473,1474],{},[76,1475],{"alt":29,"src":1476},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image72.webp",[73,1478,1479],{},"输入提交信息，并点对号进行commit",[83,1481,1483],{"id":1482},"创建新分支并进入新分支","创建新分支，并进入新分支",[73,1485,1486],{},[76,1487],{"alt":29,"src":1488},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image73.webp",[73,1490,1491],{},[76,1492],{"alt":29,"src":1493},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image74.webp",[83,1495,1496],{"id":1496},"修改内容",[73,1498,1499],{},[76,1500],{"alt":29,"src":1501},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image75.webp",[73,1503,1504],{},"显示M为修改状态",[83,1506,1508],{"id":1507},"查看历史版本对比点击文件","查看历史版本对比(点击文件)",[73,1510,1511],{},[76,1512],{"alt":29,"src":1513},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image76.webp",[83,1515,1516],{"id":1516},"提交",[73,1518,1519],{},[76,1520],{"alt":29,"src":1521},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image77.webp",[83,1523,1524],{"id":1524},"切换回main分支",[73,1526,1527],{},[76,1528],{"alt":29,"src":1529},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image78.webp",[73,1531,1532],{},[76,1533],{"alt":29,"src":1534},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image79.webp",[83,1536,970],{"id":970},[73,1538,1539],{},[76,1540],{"alt":29,"src":1541},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image80.webp",[73,1543,1544],{},[76,1545],{"alt":29,"src":1546},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image81.webp",[73,1548,1549],{},[76,1550],{"alt":29,"src":1551},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image82.webp",[83,1553,1555],{"id":1554},"push到github远程仓库","Push到Github远程仓库",[14,1557,1558],{},[17,1559,1560],{},"输入仓库名",[73,1562,1563],{},[76,1564],{"alt":29,"src":1565},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image83.webp",[73,1567,1568],{},[76,1569],{"alt":29,"src":1570},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image84.webp",[14,1572,1573],{"start":51},[17,1574,1575],{},"打开github仓库查看",[73,1577,1578],{},[76,1579],{"alt":29,"src":1580},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image85.webp",[73,1582,1583],{},[76,1584],{"alt":29,"src":1585},"https://cdn.tungchiahui.cn/tungwebsite/assets/images/2023/12/29/image86.webp",[1587,1588,1589],"style",{},"html pre.shiki code .sScJk, html code.shiki .sScJk{--shiki-default:#6F42C1;--shiki-dark:#B392F0}html pre.shiki code .sZZnC, html code.shiki .sZZnC{--shiki-default:#032F62;--shiki-dark:#9ECBFF}html pre.shiki code .sj4cs, html code.shiki .sj4cs{--shiki-default:#005CC5;--shiki-dark:#79B8FF}html .default .shiki span {color: var(--shiki-default);background: var(--shiki-default-bg);font-style: var(--shiki-default-font-style);font-weight: var(--shiki-default-font-weight);text-decoration: var(--shiki-default-text-decoration);}html .shiki span {color: var(--shiki-default);background: var(--shiki-default-bg);font-style: var(--shiki-default-font-style);font-weight: var(--shiki-default-font-weight);text-decoration: var(--shiki-default-text-decoration);}html .dark .shiki span {color: var(--shiki-dark);background: var(--shiki-dark-bg);font-style: var(--shiki-dark-font-style);font-weight: var(--shiki-dark-font-weight);text-decoration: var(--shiki-dark-text-decoration);}html.dark .shiki span {color: var(--shiki-dark);background: var(--shiki-dark-bg);font-style: var(--shiki-dark-font-style);font-weight: var(--shiki-dark-font-weight);text-decoration: var(--shiki-dark-text-decoration);}html pre.shiki code .sVt8B, html code.shiki .sVt8B{--shiki-default:#24292E;--shiki-dark:#E1E4E8}html pre.shiki code .sJ8bj, html code.shiki .sJ8bj{--shiki-default:#6A737D;--shiki-dark:#6A737D}",{"title":29,"searchDepth":51,"depth":51,"links":1591},[1592,1593,1594],{"id":12,"depth":64,"text":12},{"id":81,"depth":64,"text":81},{"id":1378,"depth":64,"text":1379},"2",2000000,"2023-12-29","2023-12-29-git-jiao-xue","/wiki/2023-12-29-git-jiao-xue","Git教学","md",true,false,null,{},"/wiki/2023-12-29-git-jiao-xue/ch2-git-shi-cao",{"title":5,"description":29},"wiki/2023-12-29-Git教学/ch2-Git实操","reiJYsHY06OlGwdrGzf-CssO5AkFjfegxQsNPGcph98",[1611,1617,1618,1624,1630],{"path":1612,"stem":1613,"title":1614,"date":1597,"chapter":1615,"chapterSort":1616,"docKey":1598,"docRoot":1599,"docTitle":1600,"isWikiDoc":1602,"isWikiIndex":1603},"/wiki/2023-12-29-git-jiao-xue/ch1-git-jian-jie","wiki/2023-12-29-Git教学/ch1-Git简介","Git简介","1",1000000,{"path":1606,"stem":1608,"title":5,"date":1597,"chapter":1595,"chapterSort":1596,"docKey":1598,"docRoot":1599,"docTitle":1600,"isWikiDoc":1602,"isWikiIndex":1603},{"path":1619,"stem":1620,"title":1621,"date":1597,"chapter":1622,"chapterSort":1623,"docKey":1598,"docRoot":1599,"docTitle":1600,"isWikiDoc":1602,"isWikiIndex":1603},"/wiki/2023-12-29-git-jiao-xue/ch3-gao-ji-gong-ju","wiki/2023-12-29-Git教学/ch3-高级工具","高级工具","3",3000000,{"path":1625,"stem":1626,"title":1627,"date":1597,"chapter":1628,"chapterSort":1629,"docKey":1598,"docRoot":1599,"docTitle":1600,"isWikiDoc":1602,"isWikiIndex":1603},"/wiki/2023-12-29-git-jiao-xue/ch4-chang-jian-wen-ti","wiki/2023-12-29-Git教学/ch4-常见问题","常见问题","4",4000000,{"path":1599,"stem":1631,"title":1632,"date":1597,"chapter":1604,"chapterSort":1633,"docKey":1598,"docRoot":1599,"docTitle":1600,"isWikiDoc":1602,"isWikiIndex":1602},"wiki/2023-12-29-Git教学/index","Git教程",0,1778560328554]