git merge<\/span>\n<\/pre>\n\n\n\n\u8be5\u547d\u4ee4\u5c31\u662f\u5728\u6267\u884c git fetch \u4e4b\u540e\u7d27\u63a5\u7740\u6267\u884c git merge \u8fdc\u7a0b\u5206\u652f\u5230\u4f60\u6240\u5728\u7684\u4efb\u610f\u5206\u652f\u3002<\/p>\n
\u5047\u8bbe\u4f60\u914d\u7f6e\u597d\u4e86\u4e00\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5e76\u4e14\u4f60\u60f3\u8981\u63d0\u53d6\u66f4\u65b0\u7684\u6570\u636e\uff0c\u4f60\u53ef\u4ee5\u9996\u5148\u6267\u884c git fetch [alias] \u544a\u8bc9 Git \u53bb\u83b7\u53d6\u5b83\u6709\u4f60\u6ca1\u6709\u7684\u6570\u636e\uff0c\u7136\u540e\u4f60\u53ef\u4ee5\u6267\u884c git merge [alias]\/[branch] \u4ee5\u5c06\u670d\u52a1\u5668\u4e0a\u7684\u4efb\u4f55\u66f4\u65b0\uff08\u5047\u8bbe\u6709\u4eba\u8fd9\u65f6\u5019\u63a8\u9001\u5230\u670d\u52a1\u5668\u4e86\uff09\u5408\u5e76\u5230\u4f60\u7684\u5f53\u524d\u5206\u652f\u3002<\/p>\n
\u00a0<\/h3>\n\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n
\u63a8\u9001\u4f60\u7684\u65b0\u5206\u652f\u4e0e\u6570\u636e\u5230\u67d0\u4e2a\u8fdc\u7aef\u4ed3\u5e93\u547d\u4ee4:<\/p>\n\n\n\n
\ngit push [alias] [branch]<\/span>\n<\/pre>\n\n\n\n\u4ee5\u4e0a\u547d\u4ee4\u5c06\u4f60\u7684 [branch] \u5206\u652f\u63a8\u9001\u6210\u4e3a [alias] \u8fdc\u7a0b\u4ed3\u5e93\u4e0a\u7684 [branch] \u5206\u652f\uff0c\u5b9e\u4f8b\u5982\u4e0b\u3002<\/p>\n
\u00a0<\/h3>\n\u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n
\u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93\u4f60\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4\uff1a<\/p>\n\n\n\n
\ngit remote rm [\u522b\u540d]<\/span>\n<\/pre>\n\n\n\n\u00a0<\/h1>\nssh\u65b9\u5f0f\u4f7f\u7528github<\/h1>\n
\u9996\u5148\u662f\u5b89\u88c5git\uff0c\u7136\u540e\u6253\u5f00gitbash\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff0c\u751f\u6210\u5bc6\u94a5\uff0c\u9ed8\u8ba4\u8f93\u51fa\u8def\u5f84\u4e3aC:\\Users\\\u5f53\u524d\u7528\u6237\\.ssh\u3002<\/p>\n\n\n\n
\nssh-keygen -t rsa<\/span>\n<\/pre>\n\n\n\n\u5c06id_rsa.pub\u516c\u94a5\u7684\u5185\u5bb9\u6dfb\u52a0\u5230 GitHub \u4e0a\uff0c\u8fd9\u6837\u672c\u5730\u7684 id_rsa \u79c1\u94a5\u8ddf GitHub\u4e0a\u7684 id_rsa.pub \u516c\u94a5\u8fdb\u884c\u914d\u5bf9\uff0c\u6388\u6743\u6210\u529f\u5c31\u53ef\u4ee5\u63d0\u4ea4\u4ee3\u7801\u3002<\/p>\n
![\"\"](\"http:\/\/www.yumefx.com\/wp-content\/uploads\/2020\/03\/git01.jpg\")
<\/p>\n
\u5982\u679c\u8981\u9a8c\u8bc1\u662f\u5426\u6210\u529f\uff0c\u53ef\u4ee5\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n\n\n\n
\nssh -T git@github.com<\/span>\n\/\/ Hi yumefx! You've successfully authenticated, but GitHub does not provide shell access. <\/span>\n<\/pre>\n\n\n\n\u00a0<\/h1>\nhttps\u65b9\u5f0f\u8bb0\u4f4f\u8d26\u53f7\u548c\u5bc6\u7801<\/h1>\n\u5168\u5c40\u8bb0\u4f4f\u8d26\u53f7\u548c\u5bc6\u7801<\/h3>\n
\u7528\u6237\u76ee\u5f55\u4e0b\u7684\u8fd9\u4e24\u4e2a\u6587\u4ef6\u589e\u52a0\u4ee5\u4e0b\u5185\u5bb9<\/p>\n
.gitconfig<\/p>\n\n\n\n
\n[user]<\/span>\n name = yumefx<\/span>\n email = yumefx@163.com<\/span>\n[credential]<\/span>\n helper = store<\/span>\n<\/pre>\n\n\n\n.git-credentials<\/p>\n\n\n\n
\nhttps:\/\/yumefx:123456@github.com<\/span>\n<\/pre>\n\n\n\n\u00a0<\/h3>\n\u9488\u5bf9\u5355\u4e2a\u4ed3\u5e93\u7684\u5b58\u50a8\u8d26\u6237\u5bc6\u7801<\/h3>\n
.git\u6587\u4ef6\u5939\u5185\u7684config\u6587\u4ef6\u7684[remote “origin”]\u680f\u7684url\u6539\u4e3ahttps:\/\/\u7528\u6237\u540d:\u5bc6\u7801@git\u5730\u5740\u3002<\/p>\n\n\n\n
\n[remote "origin"]<\/span>\n url = https:\/\/yumefx:123456@github.com\/yumefx\/test<\/span>\n<\/pre>\n\n\n\n\n\n
\n\n\n\n\u4f60\u539f\u4ee5\u4e3a\u81ea\u5df1\u662f\u98ce\u7b5d\uff0c<\/p>\n
\u526a\u65ad\u7ebf\u540e\uff0c<\/p>\n
\u53d1\u73b0\u81ea\u5df1\u771f\u7684\u662f\u53ea\u9e1f\u3002<\/p>\n
\u2014\u2014\u8fde\u5cb3<\/p>\n","protected":false},"excerpt":{"rendered":"
\u8bb0\u5f55\u4e00\u4e0bgit\u7684\u914d\u7f6e\u548c\u7528\u6cd5\uff0c\u4ee5\u53ca\u8fde\u63a5github\u7684\u5177\u4f53\u64cd\u4f5c\u6b65\u9aa4\u3002 \u00a0 git\u4ecb\u7ecd Git \u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248 […]<\/p>\n","protected":false},"author":1,"featured_media":1436,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[13,4],"tags":[51,52,14,25],"_links":{"self":[{"href":"https:\/\/www.yumefx.com\/index.php?rest_route=\/wp\/v2\/posts\/1425"}],"collection":[{"href":"https:\/\/www.yumefx.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.yumefx.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.yumefx.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.yumefx.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1425"}],"version-history":[{"count":0,"href":"https:\/\/www.yumefx.com\/index.php?rest_route=\/wp\/v2\/posts\/1425\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.yumefx.com\/index.php?rest_route=\/wp\/v2\/media\/1436"}],"wp:attachment":[{"href":"https:\/\/www.yumefx.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1425"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.yumefx.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1425"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.yumefx.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1425"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}
![\"\"](\"http:\/\/www.yumefx.com\/wp-content\/uploads\/2020\/03\/git-process.png\")
<\/h2>\n