[{"data":1,"prerenderedAt":2567},["ShallowReactive",2],{"wiki-page-\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao":3,"wiki-doc-items-\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao":2531,"language-switcher-data-\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao":2551,"wiki-i18n-paths-\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao":2566},{"id":4,"title":5,"body":6,"canonicalPath":2512,"chapterDepth":2513,"chapterOrder":2514,"date":2515,"description":29,"docI18nKey":2516,"docKey":2517,"docRoot":2518,"docTitle":2519,"extension":2520,"i18nKey":2521,"isBlogPost":2522,"isWikiDoc":2523,"isWikiIndex":2522,"layout":2524,"legacyPath":2525,"locale":2526,"localeSlug":2527,"meta":2528,"navigation":2523,"path":2512,"seo":2529,"sourcePath":2525,"sourceStem":2521,"stem":2521,"wikiDepth":37,"__hash__":2530},"content\u002Fwiki\u002F2023-12-29-Git教学\u002F0200-Git实操.md","Git实操",{"type":7,"value":8,"toc":2507},"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,1383,1388,1425,1431,1436,1447,1454,1457,1465,1470,1481,1505,1510,1529,1539,1544,1549,1563,1568,1571,1586,1592,1597,1602,1609,1614,1619,1622,1632,1637,1639,1645,1650,1656,1686,1689,1694,1700,1705,1710,1721,1726,1731,1736,1743,1748,1753,1787,1792,1796,1803,1806,1849,1860,1912,1915,1937,1943,1947,1951,1954,1958,1964,1968,1973,1976,1981,1986,1990,1995,2000,2003,2007,2012,2016,2021,2024,2028,2033,2036,2040,2045,2050,2053,2058,2061,2065,2070,2073,2078,2081,2086,2091,2093,2098,2103,2108,2112,2125,2130,2135,2140,2145,2150,2155,2160,2164,2167,2173,2178,2188,2193,2198,2205,2210,2215,2225,2229,2234,2239,2244,2249,2254,2257,2262,2283,2288,2293,2296,2301,2306,2320,2325,2330,2333,2364,2375,2380,2387,2392,2397,2400,2403,2408,2413,2416,2421,2428,2433,2436,2441,2444,2449,2452,2457,2462,2469,2474,2479,2485,2490,2495,2498,2503],[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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage2.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage3.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage4.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage5.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 .\u002Ftest.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}," .\u002Ftest.md\n",[73,238,239],{},[76,240],{"alt":29,"src":241},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage6.webp",[73,243,244],{},"接下来按键盘上的insert按键进入编辑模式&&并输入一段文本",[73,246,247],{},[76,248],{"alt":29,"src":249},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage7.webp",[73,251,252],{},"按ESC退出编辑模式",[73,254,255],{},[76,256],{"alt":29,"src":257},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage8.webp",[73,259,260],{},"按shift+冒号按键，并输入wq回车进行保存退出",[73,262,263],{},[76,264],{"alt":29,"src":265},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage9.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage10.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage11.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage12.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage13.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage14.webp",[73,426,427],{},[76,428],{"alt":29,"src":429},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage15.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage16.webp",[73,481,482],{},[76,483],{"alt":29,"src":484},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage17.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage18.webp",[73,513,514],{},[76,515],{"alt":29,"src":516},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage19.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage20.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage21.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage22.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage23.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage24.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage25.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage26.webp",[73,808,809],{},[76,810],{"alt":29,"src":811},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage27.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage28.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage29.webp",[73,877,878],{},[76,879],{"alt":29,"src":880},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage30.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage31.webp",[73,917,918],{},[76,919],{"alt":29,"src":920},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage32.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage33.webp",[73,962,963],{},[76,964],{"alt":29,"src":965},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage34.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage35.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:\u002F\u002Fgithub.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:\u002F\u002Fgithub.com(如果你打不开，请自己找办法打开)",[17,1008,1009],{},"注册并登录账号",[73,1011,1012],{},[76,1013],{"alt":29,"src":1014},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage36.webp",[14,1016,1017],{"start":64},[17,1018,1019],{},"新建远程仓库",[73,1021,1022],{},[76,1023],{"alt":29,"src":1024},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage37.webp",[73,1026,1027],{},[76,1028],{"alt":29,"src":1029},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage38.webp",[73,1031,1032],{},"这个界面建议详细设置一下，但这里是演示，所以只设置了仓库名称，其他选项为默认操作。",[73,1034,1035],{},[76,1036],{"alt":29,"src":1037},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage39.webp",[73,1039,1040],{},"如果上图出现，则说明已经创建成功了",[14,1042,1043],{"start":415},[17,1044,1045],{},"进行创建文件并提交",[73,1047,1048],{},[76,1049],{"alt":29,"src":1050},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage40.webp",[73,1052,1053],{},[76,1054],{"alt":29,"src":1055},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage41.webp",[73,1057,1058],{},"填写好文件名，文件内容，就可以点绿色按钮进行提交了。然后也可以填写提交的注释信息。",[73,1060,1061],{},[76,1062],{"alt":29,"src":1063},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage42.webp",[73,1065,1066],{},[76,1067],{"alt":29,"src":1068},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage43.webp",[14,1070,1071],{"start":599},[17,1072,1073],{},"克隆远程仓库到本地",[73,1075,1076],{},[76,1077],{"alt":29,"src":1078},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage44.webp",[24,1080,1082],{"className":26,"code":1081,"language":28,"meta":29,"style":29},"cd\nmkdir repo_floder\ncd repo_floder\ngit clone https:\u002F\u002Fgithub.com\u002Ftungchiahui\u002Ftest_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:\u002F\u002Fgithub.com\u002Ftungchiahui\u002Ftest_repo.git\n",[73,1113,1114],{},[76,1115],{"alt":29,"src":1116},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage45.webp",[73,1118,1119],{},"如果出错，请检查是否能正常访问github！",[73,1121,1122,1125],{},[76,1123],{"alt":29,"src":1124},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage46.webp",[76,1126],{"alt":29,"src":1127},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage47.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage48.webp",[73,1158,1159],{},[76,1160],{"alt":29,"src":1161},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage49.webp",[73,1163,1164],{},[76,1165],{"alt":29,"src":1166},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage50.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage51.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage52.webp",[73,1215,1216],{},"这里需要你输入github的用户名与密码，用户名则为github用户名，但是密码则为github用户token，生成token的步骤如下：",[73,1218,1219,1222],{},[76,1220],{"alt":29,"src":1221},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage53.webp",[76,1223],{"alt":29,"src":1224},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage54.webp",[73,1226,1227],{},[76,1228],{"alt":29,"src":1229},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage55.webp",[73,1231,1232],{},[76,1233],{"alt":29,"src":1234},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage56.webp",[73,1236,1237],{},"Note随便填，有效日期选择没有截止时间。",[73,1239,1240],{},"下面能勾的勾全勾上，这是权限。",[73,1242,1243],{},[76,1244],{"alt":29,"src":1245},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage57.webp",[73,1247,1248],{},"复制token并填入password中(token在终端中输入会被隐藏，输完直接回车即可)",[73,1250,1251],{},[76,1252],{"alt":29,"src":1253},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage58.webp",[14,1255,1256],{"start":740},[17,1257,1258],{},"查看远程仓库",[73,1260,1261],{},[76,1262],{"alt":29,"src":1263},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage59.webp",[73,1265,1266],{},"发现文件已经被修改了！",[14,1268,1270],{"start":1269},10,[17,1271,1272],{},"对远程仓库内容进行修改",[73,1274,1275],{},[76,1276],{"alt":29,"src":1277},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage60.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage61.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\u002Fmain\n#git diff 远程仓库名\u002F分支名\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\u002Fmain\n",[34,1323,1324],{"class":36,"line":51},[34,1325,1326],{"class":343},"#git diff 远程仓库名\u002F分支名\n",[73,1328,1329],{},[76,1330],{"alt":29,"src":1331},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage62.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage63.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:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage64.webp",[83,1377,1379],{"id":1378},"使用pull-request合并代码","使用Pull Request合并代码",[73,1381,1382],{},"Pull Request简称PR，用于请求将一个分支中的修改合并到另一个分支。PR可以让项目成员在合并前查看代码变化、留言讨论和进行审查，因此团队协作时通常不会直接将未审查的代码push到main分支。",[14,1384,1385],{},[17,1386,1387],{},"从main分支创建并进入一个功能分支",[24,1389,1391],{"className":26,"code":1390,"language":28,"meta":29,"style":29},"git checkout main\ngit pull origin main\ngit checkout -b feature\u002Fpr-demo\n",[31,1392,1393,1402,1414],{"__ignoreMap":29},[34,1394,1395,1397,1399],{"class":36,"line":37},[34,1396,67],{"class":40},[34,1398,564],{"class":44},[34,1400,1401],{"class":44}," main\n",[34,1403,1404,1406,1409,1412],{"class":36,"line":51},[34,1405,67],{"class":40},[34,1407,1408],{"class":44}," pull",[34,1410,1411],{"class":44}," origin",[34,1413,1401],{"class":44},[34,1415,1416,1418,1420,1422],{"class":36,"line":64},[34,1417,67],{"class":40},[34,1419,564],{"class":44},[34,1421,757],{"class":70},[34,1423,1424],{"class":44}," feature\u002Fpr-demo\n",[73,1426,1427,1430],{},[31,1428,1429],{},"feature\u002Fpr-demo","是本次示例的分支名，实际开发时应使用能表达修改内容的名称。",[14,1432,1433],{"start":51},[17,1434,1435],{},"修改文件并提交到本地仓库",[24,1437,1439],{"className":26,"code":1438,"language":28,"meta":29,"style":29},"vim test1.md\n",[31,1440,1441],{"__ignoreMap":29},[34,1442,1443,1445],{"class":36,"line":37},[34,1444,233],{"class":40},[34,1446,1151],{"class":44},[73,1448,1449,1450,1453],{},"按下",[31,1451,1452],{},"insert","按键,然后随便输入点正文.",[73,1455,1456],{},"例如",[24,1458,1463],{"className":1459,"code":1461,"language":1462,"meta":29},[1460],"language-text","TEST11111\n","text",[31,1464,1461],{"__ignoreMap":29},[73,1466,1467],{},[76,1468],{"alt":29,"src":1469},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787064333936-11c1cbc1.webp",[73,1471,1472,1473,1476,1477,1480],{},"然后按下",[31,1474,1475],{},"ESC",",再输入",[31,1478,1479],{},":wq","进行保存.",[24,1482,1484],{"className":26,"code":1483,"language":28,"meta":29,"style":29},"git add test1.md\ngit commit -m \"修改test1文件\"\n",[31,1485,1486,1494],{"__ignoreMap":29},[34,1487,1488,1490,1492],{"class":36,"line":37},[34,1489,67],{"class":40},[34,1491,306],{"class":44},[34,1493,1151],{"class":44},[34,1495,1496,1498,1500,1502],{"class":36,"line":51},[34,1497,67],{"class":40},[34,1499,328],{"class":44},[34,1501,331],{"class":70},[34,1503,1504],{"class":44}," \"修改test1文件\"\n",[14,1506,1507],{"start":64},[17,1508,1509],{},"将功能分支推送到Github",[24,1511,1513],{"className":26,"code":1512,"language":28,"meta":29,"style":29},"git push -u origin feature\u002Fpr-demo\n",[31,1514,1515],{"__ignoreMap":29},[34,1516,1517,1519,1522,1525,1527],{"class":36,"line":37},[34,1518,67],{"class":40},[34,1520,1521],{"class":44}," push",[34,1523,1524],{"class":70}," -u",[34,1526,1411],{"class":44},[34,1528,1424],{"class":44},[73,1530,1531,1534,1535,1538],{},[31,1532,1533],{},"-u","会建立本地分支与远程分支的跟踪关系，之后在该分支上可以直接使用",[31,1536,1537],{},"git push","。",[73,1540,1541],{},[76,1542],{"alt":29,"src":1543},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787064461783-99e8dd17.webp",[14,1545,1546],{"start":415},[17,1547,1548],{},"在Github仓库页面创建PR",[73,1550,1551,1552,1555,1556,1559,1560,1538],{},"推送新分支后，Github仓库页面通常会显示",[31,1553,1554],{},"Compare & pull request","按钮，点击该按钮。如果没有显示，也可以进入仓库的",[31,1557,1558],{},"Pull requests","页面，点击",[31,1561,1562],{},"New pull request",[73,1564,1565],{},[76,1566],{"alt":29,"src":1567},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787064906162-71445eaa.webp",[73,1569,1570],{},"确认两个分支选择正确：",[1572,1573,1574,1580],"ul",{},[17,1575,1576,1579],{},[31,1577,1578],{},"base: main","：修改最终要合并到的目标分支。",[17,1581,1582,1585],{},[31,1583,1584],{},"compare: feature\u002Fpr-demo","：包含本次修改的来源分支。",[73,1587,1588,1589,1538],{},"PR只能在两个不同的分支之间创建。确认下方显示的提交和文件变化没有问题后，填写PR标题和说明，再点击",[31,1590,1591],{},"Create pull request",[73,1593,1594],{},[76,1595],{"alt":29,"src":1596},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787064943146-74bb95c8.webp",[14,1598,1599],{"start":599},[17,1600,1601],{},"审查并继续修改PR",[73,1603,1604,1605,1608],{},"创建PR后，可以在",[31,1606,1607],{},"Files changed","页面查看本次修改，也可以邀请其他项目成员进行Review。",[73,1610,1611],{},[76,1612],{"alt":29,"src":1613},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787064981492-31b0d73a.webp",[73,1615,1616],{},[76,1617],{"alt":29,"src":1618},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065005428-a0e83f50.webp",[73,1620,1621],{},"如果审查后需要继续修改，不需要重新创建PR。只需在同一个功能分支上继续提交并push，新的提交会自动加入当前PR。",[24,1623,1624],{"className":26,"code":1438,"language":28,"meta":29,"style":29},[31,1625,1626],{"__ignoreMap":29},[34,1627,1628,1630],{"class":36,"line":37},[34,1629,233],{"class":40},[34,1631,1151],{"class":44},[73,1633,1449,1634,1636],{},[31,1635,1452],{},"按键,然后修改下正文.",[73,1638,1456],{},[24,1640,1643],{"className":1641,"code":1642,"language":1462,"meta":29},[1460],"TEST222\n",[31,1644,1642],{"__ignoreMap":29},[73,1646,1647],{},[76,1648],{"alt":29,"src":1649},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065067042-e6c639e5.webp",[73,1651,1472,1652,1476,1654,1480],{},[31,1653,1475],{},[31,1655,1479],{},[24,1657,1659],{"className":26,"code":1658,"language":28,"meta":29,"style":29},"git add test1.md\ngit commit -m \"根据Review意见修改\"\ngit push\n",[31,1660,1661,1669,1680],{"__ignoreMap":29},[34,1662,1663,1665,1667],{"class":36,"line":37},[34,1664,67],{"class":40},[34,1666,306],{"class":44},[34,1668,1151],{"class":44},[34,1670,1671,1673,1675,1677],{"class":36,"line":51},[34,1672,67],{"class":40},[34,1674,328],{"class":44},[34,1676,331],{"class":70},[34,1678,1679],{"class":44}," \"根据Review意见修改\"\n",[34,1681,1682,1684],{"class":36,"line":64},[34,1683,67],{"class":40},[34,1685,1208],{"class":44},[73,1687,1688],{},"你会发现又多了一个commit如下图.",[73,1690,1691],{},[76,1692],{"alt":29,"src":1693},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065285593-fd34b4ab.webp",[73,1695,1696,1697,1699],{},"点击",[31,1698,1607],{},"页面查看本次修改:",[73,1701,1702],{},[76,1703],{"alt":29,"src":1704},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065330682-5a3c24b2.webp",[14,1706,1707],{},[17,1708,1709],{},"合并PR",[73,1711,1712,1713,1716,1717,1720],{},"审查通过且代码没有冲突时，拥有仓库写入权限的成员可以点击",[31,1714,1715],{},"Merge pull request","，再点击",[31,1718,1719],{},"Confirm merge","完成合并。仓库如果设置了审查或自动测试规则，需要先满足这些条件才能合并。",[73,1722,1723],{},[76,1724],{"alt":29,"src":1725},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065354582-4983dc9a.webp",[73,1727,1728],{},[76,1729],{"alt":29,"src":1730},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065535509-f5281ba6.webp",[14,1732,1733],{"start":51},[17,1734,1735],{},"同步main分支并删除已合并的分支",[73,1737,1738,1739,1742],{},"合并成功后，可以在PR页面点击",[31,1740,1741],{},"Delete branch","删除Github上的功能分支。然后返回终端，更新本地main分支并删除本地功能分支。",[73,1744,1745],{},[76,1746],{"alt":29,"src":1747},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065902706-8963e001.webp",[73,1749,1750],{},[76,1751],{"alt":29,"src":1752},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065920575-e0e74498.webp",[24,1754,1756],{"className":26,"code":1755,"language":28,"meta":29,"style":29},"git checkout main\ngit pull origin main\ngit branch -d feature\u002Fpr-demo\n",[31,1757,1758,1766,1776],{"__ignoreMap":29},[34,1759,1760,1762,1764],{"class":36,"line":37},[34,1761,67],{"class":40},[34,1763,564],{"class":44},[34,1765,1401],{"class":44},[34,1767,1768,1770,1772,1774],{"class":36,"line":51},[34,1769,67],{"class":40},[34,1771,1408],{"class":44},[34,1773,1411],{"class":44},[34,1775,1401],{"class":44},[34,1777,1778,1780,1782,1785],{"class":36,"line":64},[34,1779,67],{"class":40},[34,1781,539],{"class":44},[34,1783,1784],{"class":70}," -d",[34,1786,1424],{"class":44},[73,1788,1789],{},[76,1790],{"alt":29,"src":1791},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787065949628-3cbeb701.webp",[83,1793,1795],{"id":1794},"向没有写入权限的仓库提交pr","向没有写入权限的仓库提交PR",[73,1797,1798,1799,1802],{},"如果想向其他人的开源项目贡献代码，通常没有权限直接将分支push到对方的仓库。此时需要先在Github上点击",[31,1800,1801],{},"Fork","，将该仓库复制到自己的账号下。",[73,1804,1805],{},"Fork完成后，克隆自己的仓库并记录原仓库地址：",[24,1807,1809],{"className":26,"code":1808,"language":28,"meta":29,"style":29},"git clone https:\u002F\u002Fgithub.com\u002F你的Github用户名\u002F仓库名.git\ncd 仓库名\ngit remote add upstream https:\u002F\u002Fgithub.com\u002F原仓库用户名\u002F仓库名.git\ngit remote -v\n",[31,1810,1811,1820,1827,1841],{"__ignoreMap":29},[34,1812,1813,1815,1817],{"class":36,"line":37},[34,1814,67],{"class":40},[34,1816,1108],{"class":44},[34,1818,1819],{"class":44}," https:\u002F\u002Fgithub.com\u002F你的Github用户名\u002F仓库名.git\n",[34,1821,1822,1824],{"class":36,"line":51},[34,1823,107],{"class":70},[34,1825,1826],{"class":44}," 仓库名\n",[34,1828,1829,1831,1833,1835,1838],{"class":36,"line":64},[34,1830,67],{"class":40},[34,1832,1183],{"class":44},[34,1834,306],{"class":44},[34,1836,1837],{"class":44}," upstream",[34,1839,1840],{"class":44}," https:\u002F\u002Fgithub.com\u002F原仓库用户名\u002F仓库名.git\n",[34,1842,1843,1845,1847],{"class":36,"line":415},[34,1844,67],{"class":40},[34,1846,1183],{"class":44},[34,1848,1186],{"class":70},[73,1850,1851,1852,1855,1856,1859],{},"其中",[31,1853,1854],{},"origin","指向自己Fork出来的仓库，",[31,1857,1858],{},"upstream","指向原仓库。接下来仍然需要创建功能分支，不要直接在main分支上修改。",[24,1861,1863],{"className":26,"code":1862,"language":28,"meta":29,"style":29},"git checkout -b feature\u002Fpr-demo\n# 修改文件后提交\ngit add .\ngit commit -m \"添加示例功能\"\ngit push -u origin feature\u002Fpr-demo\n",[31,1864,1865,1875,1880,1889,1900],{"__ignoreMap":29},[34,1866,1867,1869,1871,1873],{"class":36,"line":37},[34,1868,67],{"class":40},[34,1870,564],{"class":44},[34,1872,757],{"class":70},[34,1874,1424],{"class":44},[34,1876,1877],{"class":36,"line":51},[34,1878,1879],{"class":343},"# 修改文件后提交\n",[34,1881,1882,1884,1886],{"class":36,"line":64},[34,1883,67],{"class":40},[34,1885,306],{"class":44},[34,1887,1888],{"class":44}," .\n",[34,1890,1891,1893,1895,1897],{"class":36,"line":415},[34,1892,67],{"class":40},[34,1894,328],{"class":44},[34,1896,331],{"class":70},[34,1898,1899],{"class":44}," \"添加示例功能\"\n",[34,1901,1902,1904,1906,1908,1910],{"class":36,"line":599},[34,1903,67],{"class":40},[34,1905,1521],{"class":44},[34,1907,1524],{"class":70},[34,1909,1411],{"class":44},[34,1911,1424],{"class":44},[73,1913,1914],{},"推送后在Github上创建PR，并特别确认：",[1572,1916,1917,1927],{},[17,1918,1919,1922,1923,1926],{},[31,1920,1921],{},"base repository","是对方的原仓库，",[31,1924,1925],{},"base","是对方要接收修改的分支。",[17,1928,1929,1932,1933,1936],{},[31,1930,1931],{},"head repository","是自己Fork的仓库，",[31,1934,1935],{},"compare","是自己刚刚推送的功能分支。",[73,1938,1939,1940,1942],{},"之后填写标题和修改说明，点击",[31,1941,1591],{},"即可向原项目提交PR。",[10,1944,1946],{"id":1945},"vscode-git","VScode + Git",[83,1948,1950],{"id":1949},"vscode是什么","VScode是什么？",[73,1952,1953],{},"VScode是一个文本编辑器，类似于Vim等编辑器，但是他有图形界面，有非常多的好用的插件，而且可以集成编译器环境，最终也可以被用户自定义配置成Visual Studio那样的IDE。",[83,1955,1957],{"id":1956},"vscode官网","VScode官网:",[73,1959,1960],{},[374,1961,1962],{"href":1962,"rel":1963},"https:\u002F\u002Fcode.visualstudio.com\u002F",[1005],[83,1965,1967],{"id":1966},"创建文件夹并在该文件夹下打开vscode","创建文件夹并在该文件夹下打开VScode",[73,1969,1970],{},[76,1971],{"alt":29,"src":1972},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage65.webp",[83,1974,1975],{"id":1975},"新建文件",[73,1977,1978],{},[76,1979],{"alt":29,"src":1980},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage66.webp",[73,1982,1983],{},[76,1984],{"alt":29,"src":1985},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage67.webp",[83,1987,1989],{"id":1988},"初始化git类似于git-init命令","初始化Git(类似于git init命令)",[73,1991,1992],{},[76,1993],{"alt":29,"src":1994},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage68.webp",[73,1996,1997],{},[76,1998],{"alt":29,"src":1999},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage69.webp",[73,2001,2002],{},"U是指未追踪状态，也就是文件还在工作区",[83,2004,2006],{"id":2005},"将文件提交到暂存区类似git-add","将文件提交到暂存区(类似git add)",[73,2008,2009],{},[76,2010],{"alt":29,"src":2011},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage70.webp",[83,2013,2015],{"id":2014},"取消提交到暂存区点减号这里不取消","取消提交到暂存区点减号(这里不取消)",[73,2017,2018],{},[76,2019],{"alt":29,"src":2020},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage71.webp",[73,2022,2023],{},"A是added表示在暂存区",[83,2025,2027],{"id":2026},"进行提交类似于commit","进行提交(类似于commit)",[73,2029,2030],{},[76,2031],{"alt":29,"src":2032},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage72.webp",[73,2034,2035],{},"输入提交信息，并点对号进行commit",[83,2037,2039],{"id":2038},"创建新分支并进入新分支","创建新分支，并进入新分支",[73,2041,2042],{},[76,2043],{"alt":29,"src":2044},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage73.webp",[73,2046,2047],{},[76,2048],{"alt":29,"src":2049},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage74.webp",[83,2051,2052],{"id":2052},"修改内容",[73,2054,2055],{},[76,2056],{"alt":29,"src":2057},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage75.webp",[73,2059,2060],{},"显示M为修改状态",[83,2062,2064],{"id":2063},"查看历史版本对比点击文件","查看历史版本对比(点击文件)",[73,2066,2067],{},[76,2068],{"alt":29,"src":2069},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage76.webp",[83,2071,2072],{"id":2072},"提交",[73,2074,2075],{},[76,2076],{"alt":29,"src":2077},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage77.webp",[83,2079,2080],{"id":2080},"切换回main分支",[73,2082,2083],{},[76,2084],{"alt":29,"src":2085},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage78.webp",[73,2087,2088],{},[76,2089],{"alt":29,"src":2090},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage79.webp",[83,2092,970],{"id":970},[73,2094,2095],{},[76,2096],{"alt":29,"src":2097},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage80.webp",[73,2099,2100],{},[76,2101],{"alt":29,"src":2102},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage81.webp",[73,2104,2105],{},[76,2106],{"alt":29,"src":2107},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage82.webp",[83,2109,2111],{"id":2110},"push到github远程仓库","Push到Github远程仓库",[14,2113,2114],{},[17,2115,2116,2117,2120,2121,2124],{},"在下面这个界面找到 ",[31,2118,2119],{},"Publish to Github",",可能会弹出来点击",[31,2122,2123],{},"Sign In","，然后按提示在浏览器中完成Github授权。",[73,2126,2127],{},[76,2128],{"alt":29,"src":2129},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067081290-b1e5b2ef.webp",[14,2131,2132],{"start":51},[17,2133,2134],{},"输入仓库名",[73,2136,2137],{},[76,2138],{"alt":29,"src":2139},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage83.webp",[73,2141,2142],{},[76,2143],{"alt":29,"src":2144},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage84.webp",[14,2146,2147],{"start":64},[17,2148,2149],{},"打开github仓库查看",[73,2151,2152],{},[76,2153],{"alt":29,"src":2154},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage85.webp",[73,2156,2157],{},[76,2158],{"alt":29,"src":2159},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002Fimage86.webp",[83,2161,2163],{"id":2162},"使用vscode图形化提交pull-request","使用VScode图形化提交Pull Request",[73,2165,2166],{},"本节演示如何使用VScode创建、审查和合并Pull Request，整个过程不需要在终端输入Git指令。",[2168,2169,2170],"blockquote",{},[73,2171,2172],{},"注意：如果要使用Pull Request，功能分支提交完成后不要执行上文的“切换回main分支”和“合并分支”操作。应当将功能分支保持独立，通过PR审查后再合并到main分支。",[14,2174,2175],{},[17,2176,2177],{},"安装Github Pull Requests扩展",[73,2179,2180,2181,2184,2185,2187],{},"打开VScode左侧的扩展页面，搜索",[31,2182,2183],{},"GitHub Pull Requests","，安装由Github发布的",[31,2186,2183],{},"扩展。",[73,2189,2190],{},[76,2191],{"alt":29,"src":2192},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787066639021-9a02afab.webp",[14,2194,2195],{"start":51},[17,2196,2197],{},"从main创建功能分支",[73,2199,2200,2201,2204],{},"先点击VScode左下角的当前分支名，切换到main分支。在源代码管理页面点击选择",[31,2202,2203],{},"Pull","，保证本地main分支与Github上的内容一致。",[73,2206,2207],{},[76,2208],{"alt":29,"src":2209},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067349047-4d94b8b8.webp",[73,2211,2212],{},[76,2213],{"alt":29,"src":2214},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067390159-f719aeea.webp",[73,2216,2217,2218,2221,2222,2224],{},"再次点击左下角的分支名，选择",[31,2219,2220],{},"Create new branch from...","，选择main作为起点，然后输入一个能表达修改内容的分支名，例如",[31,2223,1429],{},"。创建后VScode会自动切换到该分支。",[73,2226,2227],{},[76,2228],{"alt":29,"src":2209},[73,2230,2231],{},[76,2232],{"alt":29,"src":2233},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067431992-eade67a5.webp",[73,2235,2236],{},[76,2237],{"alt":29,"src":2238},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067511583-3a757fd7.webp",[73,2240,2241],{},[76,2242],{"alt":29,"src":2243},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067526052-f9bbf20b.webp",[73,2245,2246],{},[76,2247],{"alt":29,"src":2248},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067546196-fb5d9180.webp",[14,2250,2251],{},[17,2252,2253],{},"修改文件并提交",[73,2255,2256],{},"在功能分支中修改文件并保存，然后打开源代码管理页面：",[73,2258,2259],{},[76,2260],{"alt":29,"src":2261},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067588271-e1b9561b.webp",[1572,2263,2264,2271,2277],{},[17,2265,2266,2267,2270],{},"点击文件右侧的",[31,2268,2269],{},"+","，将修改加入暂存区。",[17,2272,2273,2274,1538],{},"在上方输入提交信息，例如",[31,2275,2276],{},"Add PR demo",[17,2278,1696,2279,2282],{},[31,2280,2281],{},"Commit","完成本地提交。",[73,2284,2285],{},[76,2286],{"alt":29,"src":2287},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067621148-3174d0c2.webp",[73,2289,2290],{},[76,2291],{"alt":29,"src":2292},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067634417-f8d1f64e.webp",[73,2294,2295],{},"commit后变为",[73,2297,2298],{},[76,2299],{"alt":29,"src":2300},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067649357-58274e7e.webp",[14,2302,2303],{},[17,2304,2305],{},"在VScode中创建PR",[73,2307,2308,2309,2312,2313,2316,2317,1538],{},"打开左侧的Github Pull Requests页面，点击",[31,2310,2311],{},"Create Pull Request","。也可以按",[31,2314,2315],{},"Ctrl+Shift+P","打开命令面板，执行",[31,2318,2319],{},"GitHub Pull Requests: Create Pull Request",[73,2321,2322],{},[76,2323],{"alt":29,"src":2324},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067711915-86c8f341.webp",[14,2326,2327],{"start":51},[17,2328,2329],{},"填写PR信息",[73,2331,2332],{},"在Create Pull Request页面中检查以下内容：",[1572,2334,2335,2341,2347,2352,2358],{},[17,2336,2337,2340],{},[31,2338,2339],{},"Base Repository","：接收修改的Github仓库。",[17,2342,2343,2346],{},[31,2344,2345],{},"Base Branch","：要合并进入的目标分支，通常为main。",[17,2348,2349,2350,1538],{},"来源分支：当前的功能分支，例如",[31,2351,1429],{},[17,2353,2354,2357],{},[31,2355,2356],{},"Title","：简洁描述本次修改。",[17,2359,2360,2363],{},[31,2361,2362],{},"Description","：说明修改原因、主要内容和验证方法。",[73,2365,2366,2367,2370,2371,2374],{},"也可以根据需要添加Reviewers、Assignees和Labels。检查无误后点击",[31,2368,2369],{},"Create","提交PR；如果修改还没有完成，可以选择",[31,2372,2373],{},"Create Draft","创建草稿PR。",[73,2376,2377],{},[76,2378],{"alt":29,"src":2379},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067744001-1402f27c.webp",[73,2381,2382,2383,2386],{},"如果当前分支还没有推送到Github，VScode会提示发布分支。选择",[31,2384,2385],{},"publish branch","即可将当前功能分支推送到远程仓库。",[73,2388,2389],{},[76,2390],{"alt":29,"src":2391},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067764516-85017976.webp",[14,2393,2394],{},[17,2395,2396],{},"审查并修改PR",[73,2398,2399],{},"创建成功后，VScode会进入PR的Review Mode。在这里可以查看提交记录和文件差异、留言、邀请审查，也可以继续修改代码。",[73,2401,2402],{},"可以查看合并差异:",[73,2404,2405],{},[76,2406],{"alt":29,"src":2407},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067924816-f471716b.webp",[73,2409,2410],{},[76,2411],{"alt":29,"src":2412},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067950428-546ebd4d.webp",[73,2414,2415],{},"如果需要根据审查意见修改代码，保持在当前功能分支上，然后继续使用源代码管理页面进行Commit.也就是可以继续修改.",[73,2417,2418],{},[76,2419],{"alt":29,"src":2420},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787067992272-a06147b4.webp",[73,2422,2423,2424,2427],{},"同样先add再commit本次修改,可以命名为",[31,2425,2426],{},"Add PR demo2",".",[73,2429,2430],{},[76,2431],{"alt":29,"src":2432},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068021566-fb6e4d49.webp",[73,2434,2435],{},"最后Push。新的提交会自动加入当前PR，不需要重新创建PR。",[73,2437,2438],{},[76,2439],{"alt":29,"src":2440},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068141475-fe774f6d.webp",[73,2442,2443],{},"可以看到如图,两次commit都被PR包含了.",[73,2445,2446],{},[76,2447],{"alt":29,"src":2448},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068203009-6768f4a0.webp",[73,2450,2451],{},"也可以看到文件差异里,两次提交都被可以被合并到main了.",[73,2453,2454],{},[76,2455],{"alt":29,"src":2456},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068234996-9c2f6fa0.webp",[14,2458,2459],{},[17,2460,2461],{},"合并PR并清理分支",[73,2463,2464,2465,2468],{},"审查通过且自动检查完成后，拥有仓库写入权限的成员可以在PR详情页点击",[31,2466,2467],{},"Merge","完成合并。",[73,2470,2471],{},[76,2472],{"alt":29,"src":2473},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068282082-21f37f97.webp",[73,2475,2476],{},[76,2477],{"alt":29,"src":2478},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068295774-46294b05.webp",[73,2480,2481,2482,2484],{},"合并完成后，VScode会提示删除远程和本地的功能分支。确认PR已经正确合并后再进行删除，最后切换回main分支并点击",[31,2483,2203],{},"获取最新代码。",[73,2486,2487],{},[76,2488],{"alt":29,"src":2489},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068313339-dfe5dbc9.webp",[73,2491,2492],{},[76,2493],{"alt":29,"src":2494},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068345756-fd3adb23.webp",[73,2496,2497],{},"紧接着PR会被自动关闭.",[73,2499,2500],{},[76,2501],{"alt":29,"src":2502},"https:\u002F\u002Fcdn.tungchiahui.cn\u002Ftungwebsite\u002Fassets\u002Fimages\u002F2023\u002F12\u002F29\u002F1787068378293-1ef31793.webp",[2504,2505,2506],"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":2508},[2509,2510,2511],{"id":12,"depth":64,"text":12},{"id":81,"depth":64,"text":81},{"id":1945,"depth":64,"text":1946},"\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao",0,"0200","2023-12-29","wiki\u002F2023-12-29-git-jiao-xue","zh-cn:2023-12-29-git-jiao-xue","\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue","Git教学","md","wiki\u002F2023-12-29-Git教学\u002F0200-Git实操",false,true,null,"\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","zh-CN","zh-cn",{},{"title":5,"description":29},"9sx7X_4-uUZFWQAGWOlnSIfWCbFMvB_A61rzoO3uVkM",[2532,2537,2538,2543,2548],{"path":2533,"stem":2534,"title":2535,"date":2515,"chapterOrder":2536,"chapterDepth":2513,"docKey":2517,"docRoot":2518,"docTitle":2519,"isWikiDoc":2523,"isWikiIndex":2522},"\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0100-git-jian-jie","wiki\u002F2023-12-29-Git教学\u002F0100-Git简介","Git简介","0100",{"path":2512,"stem":2521,"title":5,"date":2515,"chapterOrder":2514,"chapterDepth":2513,"docKey":2517,"docRoot":2518,"docTitle":2519,"isWikiDoc":2523,"isWikiIndex":2522},{"path":2539,"stem":2540,"title":2541,"date":2515,"chapterOrder":2542,"chapterDepth":2513,"docKey":2517,"docRoot":2518,"docTitle":2519,"isWikiDoc":2523,"isWikiIndex":2522},"\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0300-gao-ji-gong-ju","wiki\u002F2023-12-29-Git教学\u002F0300-高级工具","高级工具","0300",{"path":2544,"stem":2545,"title":2546,"date":2515,"chapterOrder":2547,"chapterDepth":2513,"docKey":2517,"docRoot":2518,"docTitle":2519,"isWikiDoc":2523,"isWikiIndex":2522},"\u002Fzh-cn\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0400-chang-jian-wen-ti","wiki\u002F2023-12-29-Git教学\u002F0400-常见问题","常见问题","0400",{"path":2518,"stem":2549,"title":2550,"date":2515,"chapterOrder":2524,"chapterDepth":2513,"docKey":2517,"docRoot":2518,"docTitle":2519,"isWikiDoc":2523,"isWikiIndex":2523},"wiki\u002F2023-12-29-Git教学\u002Findex","Git教程",{"variants":2552},[2553,2556,2559,2562,2565],{"path":2554,"localeSlug":2555,"i18nKey":2521},"\u002Fen-us\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","en-us",{"path":2557,"localeSlug":2558,"i18nKey":2521},"\u002Fzh-hant\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","zh-hant",{"path":2560,"localeSlug":2561,"i18nKey":2521},"\u002Fzh-hk\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","zh-hk",{"path":2563,"localeSlug":2564,"i18nKey":2521},"\u002Fzh-tw\u002Fwiki\u002F2023-12-29-git-jiao-xue\u002F0200-git-shi-cao","zh-tw",{"path":2512,"localeSlug":2527,"i18nKey":2521},[2554,2525,2557,2525,2560,2525,2563,2525,2512,2525],1788531271093]