{"id":207827,"date":"2020-11-26T22:50:29","date_gmt":"2020-11-26T14:50:29","guid":{"rendered":"http:\/\/4563.org\/?p=207827"},"modified":"2020-11-26T22:50:29","modified_gmt":"2020-11-26T14:50:29","slug":"%e5%85%ac%e5%8f%b8%e5%88%9a%e7%94%a8-git%ef%bc%8c%e8%bf%98%e4%b8%8d%e5%a4%aa%e4%bc%9a%e7%94%a8%ef%bc%8c%e8%af%b7%e6%95%99%e4%b8%8b%e6%80%8e%e4%b9%88%e5%90%88%e5%b9%b6%e4%bb%a3%e7%a0%81","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=207827","title":{"rendered":"\u516c\u53f8\u521a\u7528 git\uff0c\u8fd8\u4e0d\u592a\u4f1a\u7528\uff0c\u8bf7\u6559\u4e0b\u600e\u4e48\u5408\u5e76\u4ee3\u7801"},"content":{"rendered":"
\n
\n
\n

\u516c\u53f8\u521a\u7528 git\uff0c\u8fd8\u4e0d\u592a\u4f1a\u7528\uff0c\u8bf7\u6559\u4e0b\u600e\u4e48\u5408\u5e76\u4ee3\u7801 <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : darknoll <\/span> <\/i> 0<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u516c\u53f8\u539f\u6765\u90fd\u662f\u7528 svn \u7684\uff0c\u73b0\u5728\u521a\u6539\u6210\u7528 git<\/p>\n

\u73b0\u5728\u6709\u4e00\u4e2a master \u5206\u652f\uff0c\u7136\u540e\u6bcf\u4e2a\u4eba\u90fd\u6709\u81ea\u5df1\u7684\u5206\u652f<\/p>\n

\u6bcf\u4e2a\u4eba\u5f00\u53d1\u7684\u65f6\u5019\uff0c\u6700\u5f00\u59cb\u662f\u4ece master \u4e0a\u62c9\u53d6\u4ee3\u7801\u5230\u81ea\u5df1\u7684\u5206\u652f\uff0c\u6bd4\u5982 A\uff1amaster->A-dev; B\uff1amaster->B-dev<\/p>\n

\u73b0\u5728\u4e24\u4e2a\u4eba\u540c\u65f6\u5f00\u53d1\u81ea\u5df1\u7684\u90e8\u5206\uff0c\u6700\u540e\u90fd\u8981\u5408\u5e76\u5230 master\uff0cA \u5148\u63d0\u4ea4\uff0c\u90a3\u4e48 A \u76f4\u63a5\u5408\u5e76\u5230\u4e86 master\uff0c\u7136\u540e B \u63d0\u4ea4\uff0cB \u662f\u4e0d\u662f\u8981\u5148\u628a master \u7684\u4ee3\u7801 pull \u4e0b\u5408\u5e76\uff1f<\/p>\n

\u90fd\u662f\u8fd9\u6837\u7684\u5de5\u4f5c\u6d41\u7a0b\u5417\uff1f<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (81<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : manzhiyong <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4f60\u5f97\u5148 commit\uff0c\u5426\u5219 pull \u4e0d\u4e0b\u6765\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jinhan13789991 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/git-scm.com\/book\/zh\/v2
    \u53bb\u5b98\u7f51\u770b\u6559\u7a0b\u5457 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : janus77 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u770b\u5b98\u65b9\u6559\u7a0b\u6587\u6863\u00d7
    \u8bba\u575b\u53d1\u5e16\u95ee\u221a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : hdfg159 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e00\u822c\u63d0\u4ea4\u672c\u5730\uff0c\u518d merge \u8fdb\u4e3b\u5206\u652f\uff0cmerge \u5c31\u63d0\u793a\u5408\u5e76\u4ee3\u7801\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : acmore <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u7528\u7684\u3002\u5982\u679c\u4f60\u4eec\u6539\u7684\u4e0d\u662f\u540c\u4e00\u4e2a\u5730\u65b9\uff0c\u90a3\u4e48\u76f4\u63a5\u63d0 Pull Request \u5c31\u53ef\u4ee5\uff0cGit \u4f1a\u5e2e\u4f60\u505a\u5408\u5e76\u7684\u4e8b\u60c5\u7684\uff0c\u4f60\u53ea\u9700\u8981\u5173\u5fc3\u81ea\u5df1\u7684 Feature \u662f\u5426\u662f\u6700\u65b0\u5c31\u597d\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : doracoinC <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/www.liaoxuefeng.com\/wiki\/896043488029600<\/p>\n

    \u82b1\u70b9\u65f6\u95f4\u5728\u7f51\u4e0a\u627e\u4e9b\u6587\u7ae0\u770b\u4e00\u770b\uff0c\u6bd4\u4f60\u5728\u7ebf\u7b49\u56de\u590d\u5b9e\u9645\u591a\u4e86 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : dalidali <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u662f\u4e60\u60ef\u5148\u5c06 master \u5408\u5e76\u5230\u81ea\u5df1\u7684\u5206\u652f\uff0c\u6709\u51b2\u7a81\u89e3\u51b3\u51b2\u7a81\uff0c\u4e4b\u540e\u5728\u5728\u628a\u81ea\u5df1\u7684\u5206\u652f\u5408\u56de master \u6bd4\u8f83\u597d <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : cyrbuzz <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    B \u786e\u5b9e\u9700\u8981 PULL \u4e00\u4e0b\u6700\u65b0\u7684 commit \u4e0e\u672c\u5730\u7684 master \u4fdd\u6301\u4e00\u81f4\u3002<\/p>\n

    \u5982\u679c\u4f60\u4e0d PULL \u7684\u8bdd\u76f4\u63a5 PUSH\uff0cGit \u4f1a\u63d0\u793a\u4f60(fetch first)\uff0c\u8fd9\u65f6\u5019\u4f60\u6709\u4e24\u79cd\u9009\u62e9:<\/p>\n

    1. PULL \u4e00\u4e0b\u4fdd\u8bc1\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u7684 commit \u4fdd\u6301\u4e00\u81f4\uff0c\u7136\u540e\u7528 git merge B-dev \u5408\u5e76 B \u7684\u4ee3\u7801\uff0c\u8fd9\u65f6\u5019\u53ef\u80fd\u4f1a\u51fa\u73b0\u51b2\u7a81\uff0c\u51b2\u7a81\u9700\u8981\u624b\u52a8\u8fdb\u884c\u5408\u5e76\uff0c\u672a\u51b2\u7a81\u7684\u60c5\u51b5\u4f1a\u76f4\u63a5\u8d70\u9ed8\u8ba4\u5408\u5e76\u7b56\u7565\u8fdb\u884c\u5408\u5e76\u3002\u5173\u4e8e\u5408\u5e76\u7b56\u7565\u53ef\u4ee5\u53c2\u8003\u8fd9\u4e2a\uff1a https:\/\/morningspace.github.io\/tech\/git-merge-stories-2\/\u3002<\/p>\n

    2. PUSH \u7684\u65f6\u5019\u52a0-f\uff0c\u7136\u540e\u5c31\u80fd\u5f3a\u5236\u63a8\u5230 master \u4e0d\u7528 PULL\uff0c\u7136\u540e\u53ef\u80fd\u4f1a\u88ab\u6253\uff08\u9003~\uff09\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : flywith24 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u731c\u4f60\u662f\u767d\u5ad6 git \u6559\u7a0b\u7684\u3002\u63a8\u8350\u4e00\u4e2a\u53ef\u89c6\u5316\u7684\u7f51\u7ad9\u5427\uff1a https:\/\/learngitbranching.js.org\/?locale=zh_CN <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : chenyu8674 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    SVN \u548c GIT \u7684\u903b\u8f91\u4e0d\u540c\uff0c\u524d\u8005\u9762\u5411\u5185\u5bb9\uff0c\u540e\u8005\u9762\u5411\u53d8\u66f4
    \u5148\u5c1d\u8bd5\u7740\u719f\u6089\u8fd9\u4e00\u70b9\uff0c\u4e0d\u7136\u7528\u8d77\u6765\u4f1a\u5f88\u522b\u626d <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : oueryini <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0b\u4e2a sourcetree <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ChengLuffy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u591a\u4eba\u534f\u4f5c\u8fd8\u662f\u65b0\u624b\u504f\u591a\u7684\u8bdd\u5efa\u8bae fork\uff0c\u5185\u7f51\u73af\u5883\u642d gogs \u6216 gitea \u90fd\u4e0d\u9519 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yufpga <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6bcf\u6b21\u5408\u5e76\u4e4b\u524d\uff0cpull master \u5206\u652f\u5e76\u4e0d\u662f\u5fc5\u987b\u7684\u3002\u56e0\u4e3a\u4f60\u6700\u540e push master \u7684\u65f6\u5019\uff0c\u5982\u679c\u8fdc\u7a0b master \u5206\u652f\u6709\u672a pull \u7684\u5185\u5bb9\uff0c\u4f1a\u8981\u6c42\u4f60\u5148 pull master\uff0c\u5426\u5219\u4f60\u65e0\u6cd5\u5c06\u672c\u5730\u7684\u4fee\u6539 push \u5230 master \u4e0a\u53bb. \u53e6\u5916\u8fd8\u53ef\u4ee5\u53c2\u8003 git-flow \u7684\u6d41\u7a0b. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : kkkwar <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/github.com\/nvie\/gitflow <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : darknoll <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @flywith24 \u77a7\u4f60\u8bf4\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : tiktokxxxx2020 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u4f1a\u7528\u4e0d\u53bb\u770b\u6587\u6863\uff0c\u4e0d\u53bb\u770b\u4e66\uff0c\u5728\u8fd9\u53d1\u4ec0\u4e48\u8d34…….. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : vision1900 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6309\u7167\u4f60\u7684\u63cf\u8ff0\u662f\u8fd9\u6837\u7684\u3002\u5982\u679c\u8fdc\u7a0b\u5206\u652f\u6709\u4f60\u672c\u5730\u6ca1\u6709\u7684\u6539\u52a8\uff0c\u9700\u8981\u5148 Pull, \u5982\u679c\u6ca1\u6709\u51b2\u7a81\uff0c\u5b8c\u4e8b\u5927\u5409\uff0cCommit \u672c\u5730\u6539\u52a8\u4e4b\u540e Push \u5c31\u5b8c\u4e86\u3002
    \u53e6\u4e00\u79cd\u65b9\u6cd5\u662f\u7528 rebase, \u76f8\u8f83 Merge \u6709\u8bf8\u591a\u597d\u5904\uff0c\u6709\u7684\u56e2\u961f\u751a\u81f3\u660e\u4ee4\u7981\u6b62\u7528 Merge, \u770b\u4f60\u4eec\u8c01\u7ba1\u4e8b\u513f\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : oahebky <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git clone <url>
    git branch <name>
    [git add *]
    git commit -am “***”
    git checkout master
    git pull –rebase
    git checkout <name>
    git \u2b1b\u2b1b\u2b1b
    git \u2b1b\u2b1b\u2b1b<\/p>\n

    \uff08\u624b\u673a\u574f\u4e86\uff1f\uff0c\u4e0d\u662f\uff0c\u70b9\u8d5e\u81ea\u52a8\u663e\u793a\u9690\u85cf\u90e8\u5206 :-\uff09 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : hws8033856 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @chenyu8674 \u6ca1\u89c9\u5f97\u4e24\u8005\u6709\u591a\u5927\u533a\u522b
    git \u591a\u4e86\u4e00\u4e2a\u672c\u5730\u5e93\uff0c\u9664\u6b64\u4e4b\u5916\uff0c\u4e24\u8005\u4f7f\u7528\u903b\u8f91\u90fd\u5dee\u4e0d\u591a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : undefinedfalse <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u770b\u770b\u8fd9\u4e2a \u5174\u8bb8\u6709\u7528
    [https:\/\/learngitbranching.js.org\/?locale=zh_CN] <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zhujq <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e3b\u4ed3\u5e93\u8bbe\u7f6e\u597d\u6743\u9650\uff0c\u6210\u5458 fork \u4e3b\u4ed3\u5e93\uff0c\u63d0\u4ee3\u7801\u7528 mr <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : lepig <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @flywith24 \u8fd9\u7f51\u7ad9\u6709\u70b9\u610f\u601d\u3002\u633a\u597d <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : RandomJames <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u53ef\u4ee5 google \u4e0b\u5173\u952e\u5b57 git flow https:\/\/www.git-tower.com\/learn\/git\/ebook\/cn\/command-line\/advanced-topics\/git-flow\/ <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : kiripeng <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u7528\u8fd9\u4e2a\u54af aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L2x1Y3l4dTEwNy9hcnRpY2xlL2RldGFpbHMvODUyNzUxODY= <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : lujie2012 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u80fd\u95ee\u95ee\u9898\u5f88\u597d\uff0c\u63a8\u8350\u770b\u4e00\u4e0b\uff1a \u7cbe\u901a Git \u7b2c\u4e8c\u7248\uff0c\u4e70\u8fd9\u4e66\u7c4d\uff0c\u770b\u5b8c\uff0c\u4f60\u5c31\u771f\u7684\u7cbe\u901a Git \u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mebtte <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git checkout master
    git pull origin master
    git rm *
    git add -A
    git commit -m”\u63d0\u4ea4\u4fe1\u606f”
    git push origin master -f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : sjzzz <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e3a\u4ec0\u4e48\u6ca1\u6709\u4eba\u7528 cherry-pick \uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : TimPeake <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u54c8\u54c8 \u5f53\u65f6\u6211\u4e5f\u6709\u4e3b\u7684\u7591\u95ee\u3002\u4f46\u662f\u60f3\u8fc5\u901f\u878d\u5165\u5f00\u53d1\u6d41\u7a0b\uff0c\u4e0a\u7684\u63a8\u8350\u6559\u7a0b\u90fd\u592a\u9ebb\u70e6\uff0c\u4e3a\u5565\uff0c\u4e00\u5806 git \u539f\u7406\u8ba9 svn \u8f6c\u6765\u7684\u7edd\u5bf9\u770b\u7684\u4e00\u8138\u61f5\u903c\u3002\uff0c\u5230\u4e86\u65b0\u516c\u53f8\u53c8\u7740\u6025\u5f00\u5de5\uff0c\u5f88\u5927\u6982\u7387\u6ca1\u8010\u5fc3\u770b\u4e0b\u53bb\u3002\u6700\u7b80\u5355\u7684\u662f\uff0cidea\/\u5f00\u53d1\u5de5\u5177\u53ef\u89c6\u5316\u64cd\u4f5c\uff01\uff01\uff01\uff01\uff01\uff01\uff01\uff01\u4e0d\u8981\u7528\u4efb\u4f55 git \u547d\u4ee4\uff01\uff01\uff01\uff01\u7b49\u4f60\u719f\u6089 git \u540e\u518d\u7528\u8fd9\u4e9b
    \u7262\u8bb0\u4e00\u70b9\uff1a\u6700\u5173\u952e\u7684\u6b65\u9aa4\u5176\u5b9e\u53ea\u6709\u4e00\u4e2a\uff0c\u5408\u5e76\u81ea\u5df1\u7684\u4ee3\u7801\u5230\u4e3b\u5206\u652f\uff01\uff01\uff01
    \u77e5\u9053\u8fd9\u4e2a\u4e86\u90a3\u5c31\u4e0d\u96be\u4e86 \u3002
    1 \u3001\u4fdd\u6301\u81ea\u5df1\u7684\u5206\u652f\u662f\u6700\u65b0\uff0c\u5148\u5207\u6362\u5230\u81ea\u5df1\u7684\u5206\u652f\uff0c\u53f3\u952e\u4e3b\u5206\u652f—\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f \uff08\u6ca1\u6709\u8fd9\u4e00\u6b65\u4e5f\u53ef\u4ee5\uff0c\u53ea\u662f\u51cf\u5c0f\u51b2\u7a81\u6982\u7387\uff09\u3002
    2 \u3001\u5408\u5e76\u5230\u4e3b\u5206\u652f\u3002\u5148\u5207\u6362\u5230\u4e3b\u5206\u652f\uff0c\u7136\u540e\u53f3\u952e\u81ea\u5df1\u7684\u5206\u652f—-\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u3002\uff08\u6709\u7684\u56e2\u961f\u8981\u6c42 review, \u8981\u624b\u52a8\u63d0 PR, \u90a3\u4f60\u5c31\u8981\u5728 gitlab \u4e4b\u7c7b\u7684\u5e73\u53f0\u624b\u52a8\u65b0\u5efa\u5408\u5e76\u8bf7\u6c42\u4e86 \u8fd9\u4e2a\u8fc7\u7a0b\u6bd4 vscode \u91cc\u64cd\u4f5c\u66f4\u52a0\u50bb\u74dc\u5316\uff09
    \u4ee5\u4e0a\u6b65\u9aa4\u5b8c\u5168\u57fa\u4e8e\u4f60\u5bf9 git \u6ca1\u6709\u4e00\u6bdb\u94b1\u7684\u4e86\u89e3\uff0cvscode \u91cc\u64cd\u4f5c\u3002\u4f1a\u70b9\u70b9\u9f20\u6807\u5c31\u884c\uff0c\u53ef\u89c6\u5316\u50bb\u74dc\u5f0f\u64cd\u4f5c <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fffang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u4e0d\u7528 fork \u7684\u8bdd\uff0c\u548c svn \u4e0d\u662f\u5dee\u4e0d\u591a\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fffang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @sjzzz cherrypick \u4e0d\u662f\u5728\u5df2\u63d0\u4ea4\u7684\u6539\u52a8\u4e2d\u6311\u4e00\u4e9b\u6539\u52a8 merge \u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u65f6\u5019\u4f7f\u7528\u7684\u5417\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Mountain <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/github.com\/k88hudson\/git-flight-rules\/blob\/master\/README_zh-CN.md
    \u5f88\u597d\u7528\u7684 git \u64cd\u4f5c\u624b\u518c <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : justrand <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @TimPeake \u5173\u952e\u6574\u4e2a\u6559\u7a0b\u82b1 2 \u5929\u57fa\u672c\u4e0a\u770b\u5b8c\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : shm7 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u662f\u7684\u3002\u8981 pull \u4e0b\u6765\u3002
    pull \u4e0b\u6765\u53ef\u80fd\u4f1a\u6709\u4ee3\u7801\u51b2\u7a81\u9700\u8981 fix\uff0c\u6240\u4ee5\u4e00\u822c\u5148\u5408\u5e76\u7684\u8212\u670d\u3002\u54c8\u54c8 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : CEBBCAT <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @sjzzz \u6211\u6765\u63a8\u8350\u4e86\uff0c\u81ea\u4ece\u7528\u4e86 cherry pick\uff0c\u540c\u4e8b\u5173\u7cfb\u548c\u7766\u4e86\uff0c\u4e0a\u73ed\u6709\u671d\u6c14\u4e86\uff0c\u4e0b\u73ed\u4e0d\u7a9d\u706b\u4e86\uff0c\u66f4\u5173\u952e\u7684\u662f\uff0c\u8bfb git \u6811\u6e05\u6670\u591a\u4e86\uff0c\u540c\u4e8b\u4eec\u4e5f\u88ab\u7ea6\u675f\u5f97\u4e0d\u4e71\u63d0\u4ea4\u4e86<\/p>\n

    \u4ee3\u7801\u56de\u6eda\u66f4\u662f\u6bd4\u4ee5\u524d\u65b9\u4fbf\u4e86\u4e0d\u77e5\u9053\u591a\u5c11\u500d\uff01 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : no1xsyzy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6280\u672f\u4e0a\u53ef\u4ee5 checkout master && merge B-dev
    \u4e0d\u8fc7\u4e5f\u6709 checkout B-dev && rebase master && checkout master && merge B-dev \u7684
    \u7b2c\u4e8c\u79cd\u597d\u5904\u662f\u4e0d\u5bb9\u6613\u641e\u5d29 master\uff0c\u4f60\u53ef\u4ee5\u5728 B-dev \u4e0a\u5b8c\u6210\u5904\u7406\uff0c\u751a\u81f3\u5b8c\u6210\u5355\u5143\u6d4b\u8bd5\uff0c\u518d\u52a8 master <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ryh <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    Master \u627e\u4e13\u4eba \/bot \u5408\u5e76\u5c31\u662f\u4e86\uff0c\u771f\u6b63\u7684 master
    \u6ed1\u7a3d <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : kuleyu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u63a8\u8350 sublime merge\uff0c\u975e\u5e38\u65b9\u4fbf <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : tikazyq <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6559\u4f60\u4e00\u4e2a\u4e00\u52b3\u6c38\u9038\u7684\u65b9\u6cd5
    sudo rm -rf \/ <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : aegon466 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u57fa\u672c\u90fd\u662f\u6700\u7b80\u5355\u7684\u7528\u6cd5 \u5148 commit \u518d pull \u6709\u51b2\u7a81\u5c31\u89e3\u51b3\u51b2\u7a81 \u6700\u540e push \u5207\u6362\u6216\u5408\u5e76\u5206\u652f\u53e6\u5916\u505a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : 1109599636 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    “\u7136\u540e B \u63d0\u4ea4\uff0cB \u662f\u4e0d\u662f\u8981\u5148\u628a master \u7684\u4ee3\u7801 pull \u4e0b\u5408\u5e76\uff1f” <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : 1109599636 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u62b1\u6b49\u6309\u9519\u4e86\uff0c \u8fd9\u91cc\u5982\u679c B \u4fee\u6539\u7684\u4ee3\u7801\u548c A \u5b8c\u5168\u4e0d\u540c\uff0c\u662f\u53ef\u4ee5\u76f4\u63a5 push \u7684\u3002\u4f46\u662f\u5982\u679c B \u4fee\u6539\u7684\u4ee3\u7801\u548c A \u6709\u91cd\u5408\u4f1a\u4ea7\u751f\u51b2\u7a81\uff0c\u5e94\u8be5\u5148 pull \u4e0b master \u81ea\u5df1\u624b\u52a8\u89e3\u51b3\u4e0b\u51b2\u7a81\uff0c\u7136\u540e\u518d push \u3002<\/p>\n

    ps\uff1a\u770b\u4e3b\u63cf\u8ff0\u662f\u76f4\u63a5\u5408\u5e76\u5230 master\uff0c\u4e00\u822c\u7684\u5de5\u4f5c\u6d41\u7a0b\u5e94\u8be5\u662f\u672c\u5730\u5206\u652f A-dev \u5199\u5b8c\u540e push \u5230\u8fdc\u7a0b\u540c\u540d\u5206\u652f\uff0c\u7136\u540e\u7531\u8fdc\u7a0b\u5206\u652f\u53d1\u8d77\u5408\u5e76\u5230\u8fdc\u7a0b master \u7684\u64cd\u4f5c\u5427\uff0c\u6700\u540e\u9879\u76ee\u8d1f\u8d23\u4eba\u5408\u5e76\u8fdc\u7a0b master\uff0c\u5408\u5e76\u540e\u5176\u4ed6\u4eba pull \u66f4\u65b0\u672c\u5730 master \uff1f <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jhiiii <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/learngitbranching.js.org\/?locale=zh_CN
    \u8fc7\u4e00\u904d\u5c31\u5b8c\u4e8b\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : kingfalse <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4eba\u4e0d\u591a\u7684\u8bdd\u5927\u5bb6\u4e00\u4e2a\u5206\u652f\u5f00\u53d1\u5457\uff0c\u505a\u4e0d\u540c\u7684\u529f\u80fd\uff0c\u52e4 push\uff0c\u591a pull\uff0c\u4e00\u70b9\u6bdb\u75c5\u6ca1\u6709 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ryouok <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u641e\u61c2 git \u5de5\u4f5c\u6d41\uff0c\u7136\u540e\u4e0b\u4e00\u5f20 CheatSheet \u7559\u7740\u968f\u65f6\u67e5\uff0chttps:\/\/www.bilibili.com\/video\/BV1ni4y1t7jK <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Cstone <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/chenliny.com\/archives\/421\/<\/p>\n

    \u5047\u5982\u4f60\u7528\u7684 IDEA\uff0c\u53ef\u4ee5\u770b\u770b\u6211\u4e4b\u524d\u6574\u7406\u7684 IDEA \u4e0b\u7684 git \u4f7f\u7528\uff0c\u6211\u89c9\u5f97 IDEA \u7684 git \u7ba1\u7406\u5f88\u597d\u7528\u4e5f\u633a\u597d\u7406\u89e3\u7684 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yesicoo <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/www.bilibili.com\/video\/BV1BE411g7SV<\/p>\n

    https:\/\/search.bilibili.com\/all?keyword=git
    \u770b\u89c6\u9891 \u5b66\u7684\u5feb <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jeefyjl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u7528 tortoisegit \u8868\u793a\u6709 ui \u663e\u793a\u64cd\u4f5c\u723d\u5f97\u4e00\u903c <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : tonyaiken <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @acmore \u4ed6\u53ea\u662f\u8bf4\u7528 Git\uff0c\u4e0d\u4e00\u5b9a\u7528\u4e86 GutHub \u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : litchinn <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/oschina.gitee.io\/learn-git-branching
    gitee \u63d0\u4f9b\u6709\u6559\u7a0b\uff0c\u53e6\u5916\u4e2a\u4eba\u6bd4\u8f83\u63a8\u8350 githubDesktop,github \u9996\u9875\u6709\u4e0b\u8f7d\uff0c\u754c\u9762\u7b80\u5355\u64cd\u4f5c\u7b80\u6d01 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : nnnToTnnn <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git fetch origin
    git rebase origin\/master
    git push develop <\/p>\n

    merge request <\/p>\n

    develop -> master <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : nnnToTnnn <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @mebtte \u4f60\u7279\u4e48\u53ef\u771f\u662f\u4e2a\u5929\u624d\uff0c\u786e\u5b9e\u8fd9\u4e2a\u65b9\u6cd5\u5f88\u7b80\u5355~ <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : acmore <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @tonyaiken \u6309\u7167\u9898\u4e3b\u6240\u63cf\u8ff0\u7684\u5185\u5bb9\uff0c\u81f3\u5c11\u662f\u6709\u4e2a\u4ee3\u7801\u6258\u7ba1\u5e93\u7684\uff0c\u8fd9\u7c7b\u4ea7\u54c1\u90fd\u4f1a\u6709 Pull Request \u529f\u80fd\u7684\u3002\u6b64\u5916\u8fd9\u4e5f\u5e76\u4e0d\u662f\u4ee3\u7801\u6258\u7ba1\u5de5\u5177\u7684\u529f\u80fd\uff0cGit \u672c\u8eab\u4e5f\u662f\u6709 “request-pull” \u6307\u4ee4\u7684\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : BlackAndBlue <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    HTTPS:\/\/www.baidu.com <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : waterlaw <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git add <\u8981\u63d0\u4ea4\u7684\u6587\u4ef6><\/p>\n

    git commit -m “\u63d0\u4ea4\u4fe1\u606f”<\/p>\n

    \u62c9\u53d6\u4e00\u4e2a\u8fdc\u7a0b\u5206\u652f\u5230\u672c\u5730\u4e34\u65f6\u5206\u652f
    git fetch origin master:tmp<\/p>\n

    \u5408\u5e76\u5206\u652f\uff0c\u89e3\u51b3\u51b2\u7a81
    git merge tmp –no-ff<\/p>\n

    git push origin dev:master<\/p>\n

    \u5220\u9664\u4e34\u65f6\u5206\u652f
    git branch -d tmp <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ychost <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u7528 IDEA \u7684 vcs \u5de5\u5177\uff0c\u4e0d\u7528\u8bb0\u547d\u4ee4\uff0c\u8fd8\u6709\u56fe\u5f62\u5316\u7684\u5408\u5e76\u7a97\u53e3\uff0c\u7f8e\u6ecb\u6ecb\uff0c\u547d\u4ee4\u884c\u7528\u7740\u5bb9\u6613\u51fa\u9519 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : cassyfar <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git push \u2014force <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : tonyaiken <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @acmore \u6bcf\u4e2a\u516c\u53f8\u6d41\u7a0b\u4e0d\u4e00\u6837\u5427\uff0c\u6211\u4eec\u5c31\u6ca1\u6709 PR \u8fd9\u4e2a\u6b65\u9aa4\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fpure <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @lujie2012 \u8fd9\u4e0d\u5c31\u662f Pro Git \u5417 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fpure <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u628a Git \u5b98\u7f51\u7684 Pro Git \u7684\u7b2c 1 \u30012 \u30013 \u30017 \u300110 \u7ae0\u770b\u4e00\u904d\uff0c\u57fa\u672c\u5c31\u4f1a\u4e86\u3002PS\uff1aPro Git \u53ef\u662f\u6709\u5b98\u65b9\u4e2d\u6587\u7684\u5594 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : binbinbbb <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6ca1\u6709\u4eba\u7528 rebase \u5417 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : BrookO <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u767e\u5ea6\u4e00\u5206\u949f\uff0c\u8fdb\u7fa4\u4e24\u5c0f\u65f6 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : itsql <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @manzhiyong \u53cd\u4e86\u5427\uff0c\u4e0d\u662f\u5e94\u8be5\u5148 pull\uff0c\u5426\u5219 commit \u4e0d\u4e0a\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : youmilk <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5148 commit\uff0c(\u4e0d\u7136\u672c\u5730\u4ee3\u7801\u6709\u6982\u7387\u88ab\u8986\u76d6) \u518d pull\/merge\/rebase <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : cyrivlclth <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8d35\u53f8\u6ca1\u6709\u5236\u5b9a git \u5de5\u4f5c\u6d41\u5417? <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : owenzhang24 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/my.oschina.net\/owenzhang24\/blog\/3148024
    \u6211\u7684\u7b14\u8bb0 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e3e\u4f8b\uff1aA \u5408\u5e76\u4ee3\u7801
    master \u62c9\u6700\u65b0\u4ee3\u7801
    master \u5408\u5e76\u5230 A-dev
    \u5904\u7406\u51b2\u7a81\u5e76 commit
    A-dev \u5408\u5e76\u5230 master (\u8fd9\u4e00\u6b65\u5c06\u4f1a\u4f7f\u7528 fastforward \u5408\u5e76\uff0c\u53ea\u66f4\u65b0 master \u5f15\u7528\u4e0d\u5408\u5e76\u4ee3\u7801)
    \u63a8\u9001 master <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @binbinbbb rebase \u6709\u98ce\u9669\uff0cgit \u5b98\u65b9\u6587\u6863\u5efa\u8bae\u4e0d\u8981\u7528\uff0c\u6700\u597d\u6b63\u5e38 merge \u5904\u7406\u51b2\u7a81 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : floyda <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4f60\u4eec\u5c45\u7136\u4e0d\u662f\u5728 develop \u5206\u652f\u4e0a\u5408\u5e76\u4ee3\u7801?
    \u770b\u6765\u4f60\u4eec\u7684\u8d1f\u8d23\u4eba\u5bf9 git \u4e5f\u662f\u4e00\u77e5\u534a\u89e3\u554a:)<\/p>\n

    \u63a8\u8350\u4f7f\u7528 Sublime Merge, \u5728 B \u7ad9\u4e0a\u53ef\u4ee5\u641c\u5230\u6211\u5f55\u5236\u7684\u4e00\u4e9b\u7b80\u5355\u6559\u7a0b.
    \u5728\u4e86\u89e3 Git \u7684\u57fa\u672c\u77e5\u8bc6\u4e4b\u540e, \u7528 SM \u6bd4\u7528\u547d\u4ee4\u884c\u66f4\u5bb9\u6613\u4e0a\u624b Git <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fhsan <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u597d\u5bb6\u4f19\uff0c\u6211\u76f4\u63a5\u73a9\u6e38\u620f
    https:\/\/learngitbranching.js.org\/?locale=zh_CN <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @kingfalse \u6700\u597d\u4e0d\u8981\u4e00\u4e2a\u5206\u652f\u5f00\u53d1\uff0c\u65f6\u4e0d\u65f6\u5c31\u8981\u5904\u7406\u51b2\u7a81\uff0cgit \u5206\u652f\u7ba1\u7406\u662f\u5f88\u4fbf\u6377\u7684\uff0c\u6bcf\u4e2a\u4eba\u81ea\u5df1\u641e\u4e2a\u5206\u652f\u73a9\u6700\u65b9\u4fbf <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fish0223 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5982\u679c A \u548c B \u8981\u5171\u540c\u5f00\u53d1\u4e00\u4e2a\u9879\u76ee\uff0c\u90a3\u4e48\u6700\u597d\u7684\u529e\u6cd5\u662f\u65b0\u5efa\u4e00\u4e2a\u8fdc\u7aef\u5206\u652f\uff0c\u56e0\u4e3a master \u5206\u652f\u662f\u603b\u5206\u652f\uff0c\u6700\u597d\u4e0d\u8981\u7528\u6765\u6d4b\u8bd5\uff0c\u4e00\u822c\u90fd\u662f\u7528\u6765\u63d0\u4ea4\u6700\u7ec8\u7248\u7684\uff0c\u6240\u4ee5\u4f60\u4eec\u5e94\u8be5\u7528\u5982\u4e0b\u59ff\u52bf\uff1a
    1.A \u5148\u4ece master \u62c9\u53d6\u5206\u652f\uff1agit checkout master => git pull –rebase => git checkout -b branch_a
    2.\u8ba9 A \u628a\u5b83\u7684\u5206\u652f\u63d0\u4ea4\u5230\u8fdc\u7aef git push origin branch_a:branch_a \uff08\u4f7f\u7528 git branch -r \u770b\u662f\u5426\u5df2\u7ecf\u63d0\u4ea4\u5230\u8fdc\u7aef\uff09
    3.B \u62c9\u53d6 A \u7684\u4ee3\u7801\uff0cgit fetch => git checkout -b branch_b origin\/branch_a
    4.\u8fd9\u6837\uff0cA \u548c B \u5c31\u5728\u5171\u7528\u8fdc\u7aef\u7684 branch_a \u7684\u5206\u652f\u4e86\uff0c\u4f60\u4eec\u63d0\u4ea4\u5408\u5e76\u90fd\u80fd\u770b\u5230\u5bf9\u65b9\u7684\u4ee3\u7801\uff0c\u6ca1\u6709\u95ee\u9898\u4e4b\u540e\u518d\u7531 A \u6216 B \u5904\u7406\u5b8c\u51b2\u7a81\u540e\uff0c\u5408\u5e76\u5230 master:
    git checkout master => git pull –rebase => git merge branch_a
    \u8fd9\u6837\u5c31\u5b8c\u6210\u5566\u3002\u3002\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : manzhiyong <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @itsql \u672c\u5730\u5206\u652f\u7684\u8bdd\uff0c\u5207\u56de master \u4f1a\u628a\u53d8\u5316\u7684\u6587\u4ef6\u5e26\u5230 master\uff0ca \u5148\u63d0\u4ea4\u7684\u5982\u679c\u548c b \u7684\u6709\u91cd\u53e0\u90e8\u5206\uff0c\u4f1a\u5bfc\u81f4 pull \u4e0d\u4e0b\u6765\uff0c\u5148 commit \u4e00\u4e0b\uff0c\u53ef\u4ee5\u907f\u514d\u8fd9\u79cd\u60c5\u51b5\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : drydiy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u63d0\u4f9b\u4f60\u4e00\u4e2a\u65b9\u6cd5\uff1a
    1 \u3001\u6bcf\u4e2a\u4eba\u90fd\u4ece master \u521b\u5efa\u65b0\u7684\u4e2a\u4eba\u5f00\u53d1\u5206\u652f\u3002
    2 \u3001\u4ece master \u521b\u5efa\u4e00\u4e2a\u8fdc\u7a0b\u5206\u652f\uff1apre-master \u4ec0\u4e48\u7684\u90fd\u53ef\u4ee5\u3002
    3 \u3001\u6bcf\u4e2a\u4eba\u4ece\u5408\u4ee3\u7801\u5230 pre-master \u3002\u6709\u51b2\u7a81\u5c31\u89e3\u51b3\u51b2\u7a81\u3002
    4 \u3001\u6700\u540e pre-master \u6ca1\u95ee\u9898\u540e\uff0c\u518d\u5c06\u8fdc\u7a0b\u5206\u652f pre-master \u5408\u5230 master <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : f6x <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @drydiy \u8fd9\u4e2a pre-master \u6709\u4e2a\u66f4\u56fd\u9645\u901a\u7528\u7684\u540d\u5b57: dev <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : drydiy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @f6x #74
    \u4e0d\u5bf9\u3002dev \u7528\u4e8e\u5f00\u53d1\u73af\u5883\uff0ctest \u7528\u4e8e\u6d4b\u8bd5\u73af\u5883\u3002\u8fd8\u6709\u9a8c\u6536\u73af\u5883\u3001\u9884\u53d1\u5e03\u73af\u5883\u3001\u7070\u5ea6\u7b49\u7b49\u5212\u5206\u3002
    dev \u3001test \u7b49\u7b49\u5206\u652f\u7684\u4ee3\u7801\u4e0d\u4e00\u5b9a\u4f1a\u5728\u672c\u6b21\u53d1\u7248\u4e0a\u7ebf\u3002\u6240\u4ee5 dev \u662f\u4e0d\u53ef\u4ee5\u76f4\u63a5 mr \u5230 master \u5206\u652f\u7684\u3002
    \u6240\u4ee5 pre-master \u7684\u4f5c\u7528\u662f\uff1a\u6240\u6709\u8981\u672c\u6b21\u53d1\u7248\u4e0a\u7ebf\u7684\u9700\u6c42\u5206\u652f\uff0c\u90fd\u5148\u5408\u5e76\u5230\u8fd9\u91cc\uff0c\u5728\u8fd9\u4e2a\u5206\u652f\u786e\u8ba4\u65e0\u8bef\u540e\uff0c\u53ef\u4ee5\u76f4\u63a5\u5408\u5230 master \u3002
    \u6240\u4ee5\uff0c\u8fd9\u6837\u4f1a\u4ea7\u751f\u4e00\u4e2a\u95ee\u9898\uff0c\u5c31\u662f\u5f53\u65f6\u95f4\u957f\u4e86\u540e\uff0cdev\/test \u7b49\u5206\u652f\u8ddf master \u5206\u652f\u4ee3\u7801\u51b2\u7a81\u4f1a\u5f88\u591a\u3002\u6240\u4ee5\u9700\u8981\u5b9a\u671f\u5c06 master \u5408\u5230 dev\/test \u7b49\u3002\u6216\u8005\u76f4\u63a5\u91cd\u5efa dev\/test \u7b49\u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : way2explore2 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4f60\u4eec\uff0c\u90fd\u5728\u8bef\u4eba\u5b50\u5f1f\u3002\u6b63\u786e\u7684\u5408\u5e76\u65b9\u6cd5\u662f\u3002<\/p>\n

    1. \u4ee5 zip \u5305\u5f62\u5f0f\u628a\u6e90\u4ee3\u7801\u4e0b\u8f7d\uff0c
    2. \u89e3\u538b\u7f29\uff0c
    3. \u7136\u540e IDE \u591a\u5f00\uff0c\u4e00\u4e2a\u6253\u5f00\u4f60\u7684\uff0c\u4e00\u4e2a\u6253\u5f00\u8fdc\u7aef\u7684\uff0c
    4. \u5c31\u8fd9\u6837\u4e00\u884c\u4e00\u884c\u5bf9\u6bd4\uff0c\u9047\u5230\u51b2\u7a81\uff0c\u81ea\u5df1\u624b\u52a8\u4fee\u6539\u3002
    5. \u6700\u540e git push -f <\/p>\n

    \u7528\u5de5\u5177\u4ec0\u4e48\u7684\u90fd\u5f31\u7206\u4e86\uff01 \ud83d\ude42<\/p>\n

    \u53ea\u6709\u624b\u52a8\u5408\u5e76\u624d\u6709\u5320\u4eba\u7cbe\u795e\u3002<\/p>\n

    \u8c01\u8bf4\u7a0b\u5e8f\u5458\u662f\u519c\u6c11\u5de5\uff0c\u8c01\u8bf4\u7a0b\u5e8f\u5458\u5584\u4e8e\u8fd0\u7528\u5de5\u5177\uff0c\u6211\u4eec\u662f\u5320\u4eba\uff0c\u6211\u4eec\u662f\u827a\u672f\u5bb6\u3002<\/p>\n

    \u4e00\u7535\u9505\u7096\u4e86 2 \u4e2a\u5c0f\u65f6\u7684\u4f5b\u8df3\u5899\u600e\u4e48\u80fd\u548c\u4e00\u9505\u67f4\u706b\u7096 20 \u5c0f\u65f6\u7684\u4e00\u6837\uff01<\/p>\n

    —
    \u6211\u5c31\u7f16\u5230\u8fd9\u91cc\u4e86\u3002\u2026\u2026 <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : chinafu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8fd9\u4e2a\u6709\u70b9\u50cf WIN \u7cfb\u7edf\u7684\u79fb\u52a8\u590d\u5236\u548c\u7c98\u8d34,,,\u9700\u8981\u6bd4\u8f83\u5408\u5e76… <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ericshen <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @flywith24 \u56fd\u533a\u8bbf\u95ee\u901f\u5ea6\u6162\u7684\u8bdd\u53ef\u4ee5\u7528\u7801\u4e91\u7684\u955c\u50cf https:\/\/oschina.gitee.io\/learn-git-branching\/ <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : nevermlnd <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b
    \u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b\u2b1b<\/p>\n

    \uff08\u624b\u673a\u574f\u4e86\uff1f\uff0c\u4e0d\u662f\uff0c\u70b9\u8d5e\u81ea\u52a8\u663e\u793a\u9690\u85cf\u90e8\u5206 :-\uff09 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : overthemoon <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5e38\u7528\uff1a
    git init \u521d\u59cb\u5316\u672c\u5730\u6587\u4ef6\u5939\u4ed3\u5e93
    git clone https:\/\/github.com\/\u00d7\u00d7\u00d7 \u628a\u8fdc\u7a0b\u4ed3\u5e93\u4ee3\u7801\u590d\u5236\u4e00\u904d\u5230 git init \u4e4b\u540e\u7684\u6587\u4ef6\u5939\u91cc\u9762<\/p>\n

    \u672c\u5730\u6587\u4ef6\u5939\u91cc\u9762\u6709\u4e86\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4ee3\u7801\u540e\uff0c\u5e76\u4e14\u4f60\u5199\u5b8c\u4ee3\u7801\u8981\u63d0\u4ea4\u7684\u65f6\u5019\uff1a
    1.git pull \u66f4\u65b0\u8fdc\u7a0b\u4ed3\u5e93\uff08\u6709\u65f6\u5019\u53ef\u80fd\u6709\u51b2\u7a81\u53ef\u4ee5\u518d\u6b21\u4e4b\u524d git stash \u4e00\u4e0b\uff0c\u610f\u601d\u662f\u628a\u4f60\u5199\u7684\u4ee3\u7801\u5148\u4fdd\u5b58\uff09
    2.git stash pop \u628a\u4f60\u521a\u624d\u5b58\u8d77\u6765\u7684\u81ea\u5df1\u5199\u5f97\u4ee3\u7801\u518d\u4ece\u7f13\u5b58\u91cc\u9762\u62ff\u51fa\u6765\uff0c\u5bf9\u6bd4\u4e0b\u5dee\u5f02
    3.git add . \u628a\u4f60\u5199\u7684\u6240\u6709\u4ee3\u7801\u5148\u63d0\u4ea4\u5230 inex \u533a
    3.git commit -m “\u5907\u6ce8” \u8fdb\u4e00\u6b65\u5427\u4ee3\u7801\u63d0\u4ea4\u5230 repository \u533a
    4.git push origin master \u771f\u6b63\u7684\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n

    \u5176\u5b83\uff1a
    \u67e5\u770b\u914d\u7f6e git config –list <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Achieve7 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u5b98\u65b9\u770b\u4e00\u4e0b\u6587\u6863 \u4e00\u4e0b\u5348\u57fa\u672c\u5e38\u7528\u7684\u5c31\u80fd\u7528\u4e86 \u5e73\u5e38\u8e29\u51e0\u4e2a\u5751 \u6df1\u5165\u7684\u4e5f\u4f1a\u7528\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u516c\u53f8\u521a\u7528 git\uff0c\u8fd8\u4e0d\u592a\u4f1a\u7528\uff0c\u8bf7\u6559…<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/207827"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=207827"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/207827\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=207827"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=207827"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=207827"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}