{"id":882,"date":"2018-01-30T13:49:47","date_gmt":"2018-01-30T05:49:47","guid":{"rendered":"http:\/\/www.ponybai.com\/?p=882"},"modified":"2018-01-30T13:49:47","modified_gmt":"2018-01-30T05:49:47","slug":"%e7%89%88%e6%9c%ac%e6%8e%a7%e5%88%b6%ef%bc%885%ef%bc%89","status":"publish","type":"post","link":"http:\/\/www.ponybai.com\/?p=882","title":{"rendered":"\u7248\u672c\u63a7\u5236\uff085\uff09"},"content":{"rendered":"<div class=\"unit-content\">\n<h3 class=\"ph\">\u5b66\u4e60\u76ee\u6807<\/h3>\n<p>\u5b8c\u6210\u672c\u5355\u5143\u540e\uff0c\u60a8\u5c06\u80fd\u591f\uff1a<\/p>\n<ul>\n<li>\u5c06GitHub\u5de5\u4f5c\u6d41\u8f6c\u6362\u4e3a\u9002\u7528\u4e8e\u56e2\u961f\u7684\u6709\u6548\u5206\u652f\u7b56\u7565\u3002<\/li>\n<li>\u89e3\u51b3GitHub\u4e0a\u7684\u5408\u5e76\u51b2\u7a81\u3002<\/li>\n<li>\u521b\u5efa\u4ee3\u8868\u5355\u4e2a\u5de5\u4f5c\u5355\u5143\u7684\u539f\u5b50\u63d0\u4ea4\u3002<\/li>\n<\/ul>\n<p><img fetchpriority=\"high\" decoding=\"async\" src=\"https:\/\/res.cloudinary.com\/hy4kyit2a\/image\/upload\/v1498165883\/doc\/trailhead\/staging\/team-trailhead_get-started-with-salesforce-dx_en-us_git-and-git-hub-basics_images_5-branching_b5c10c45c3d9ac011d76cecabb4e4fce.png\" alt=\"Illustration of branching in GitHub.\" width=\"624\" height=\"215\" \/><\/p>\n<h3 class=\"ph\">\u5206\u652f\u7b56\u7565\u7684\u5de5\u4f5c<\/h3>\n<p>\u73b0\u5728\u60a8\u5df2\u7ecf\u901a\u8fc7\u4e00\u4e2a\u7b80\u5355\u7684GitHub\u6d41\u7a0b\u793a\u4f8b\uff0c\u60f3\u8c61\u4e00\u4e0b\u5de5\u4f5c\u6d41\u7a0b\u5982\u4f55\u4e0e\u56e2\u961f\u4e00\u8d77\u5de5\u4f5c\u3002\u5c06\u6240\u6709\u5206\u652f\uff0c\u63d0\u4ea4\u548c\u8bf7\u6c42\u6570\u91cf\u4e58\u4ee5\u56e2\u961f\u4e2d\u540c\u4e8b\u7684\u6570\u91cf\uff0c\u5e76\u79ef\u6781\u5f00\u53d1\u3002\u4ee5\u524d\u6709\u5f88\u591a\u56e2\u961f\u90fd\u505a\u8fc7\u8fd9\u6837\u7684\u4e8b\u60c5\uff0c\u800c\u4e14\u6709\u4e00\u4e9b\u6210\u529f\u7684\u6a21\u5f0f\u3002<\/p>\n<p>\u4e00\u822c\u6765\u8bf4\uff0c\u5206\u652f\u673a\u6784\u5e94\u8be5\u662f\u77ed\u6682\u7684\uff0c\u521b\u5efa\u5b8c\u6210\u4e00\u4e2a\u529f\u80fd\uff0c\u5e76\u5728\u5408\u5e76\u540e\u5220\u9664\u3002\u77ed\u547d\u7684\u5206\u652f\u53ef\u907f\u514d\u6df7\u6dc6\uff0c\u9f13\u52b1\u6700\u65b0\u7684\u4ee3\u7801\uff0c\u5e76\u8bbe\u7f6e\u5f00\u53d1\u4eba\u5458\u5bf9\u9879\u76ee\u8fdb\u884c\u8fed\u4ee3\u6539\u8fdb\u3002<\/p>\n<p>\u957f\u65f6\u95f4\u8fd0\u884c\u7684\u5206\u652f\u53ef\u80fd\u4f1a\u9020\u6210\u95ee\u9898\uff0c\u5982\u679c\u4e0d\u88ab\u6709\u610f\u4f7f\u7528\u3002\u6709\u65f6\u5019\uff0c\u957f\u671f\u7684\u5206\u652f\u5bf9\u4e8e\u5f00\u53d1\u5206\u652f\u662f\u6709\u610f\u4e49\u7684\uff0c\u6216\u8005\u5bf9\u4e8e\u9700\u8981\u591a\u7ea7\u90e8\u7f72\u7ea7\u4ee3\u7801\u7684\u5176\u4ed6\u60c5\u51b5\u3002\u957f\u671f\u8fd0\u884c\u7684\u5206\u652f\u6240\u9762\u4e34\u7684\u5927\u90e8\u5206\u6311\u6218\u6765\u81ea\u4e8e\u6ca1\u6709\u6bcf\u4e2a\u5206\u652f\u7684\u6700\u65b0\u7248\u672c\u7684\u5f00\u53d1\u4eba\u5458\uff0c\u9020\u6210\u4e86\u4e0d\u5fc5\u8981\u7684\u5408\u5e76\u51b2\u7a81\uff0c\u6df7\u6dc6\u548c\u5de5\u4f5c\u3002\u867d\u7136\u66f4\u590d\u6742\u7684\u5206\u652f\u5de5\u4f5c\u6d41\u53ef\u80fd\u770b\u8d77\u6765\u662f\u6b63\u786e\u7684\u89e3\u51b3\u65b9\u6848\uff0c\u4f46\u662f\u5b83\u4eec\u7ecf\u5e38\u8fc7\u4e8e\u590d\u6742\uff0c\u66f4\u7b80\u5355\u7684GitHub\u6d41\u66f4\u6709\u6548\u5730\u5de5\u4f5c\u3002<\/p>\n<p>\u6709\u4e9b\u95ee\u9898\u8981\u95ee\u4f60\u7684\u56e2\u961f\u5206\u652f\uff1a<\/p>\n<ul>\n<li>\u6211\u4eec\u5c06\u4f7f\u7528\u54ea\u79cd\u5206\u652f\u7b56\u7565\uff1f<\/li>\n<li>\u54ea\u4e2a\u5206\u652f\u5c06\u4f5c\u4e3a\u6211\u4eec\u7684\u4e3b\u6216\u90e8\u7f72\u4ee3\u7801\uff1f<\/li>\n<li>\u6211\u4eec\u5c06\u4f7f\u7528\u547d\u540d\u7ea6\u5b9a\u4e3a\u6211\u4eec\u7684\u5206\u652f\u673a\u6784\uff1f<\/li>\n<li>\u6211\u4eec\u5c06\u5982\u4f55\u4f7f\u7528\u6807\u7b7e\u548c\u53d7\u8ba9\u4eba\uff1f<\/li>\n<li>\u6211\u4eec\u4f1a\u4f7f\u7528\u91cc\u7a0b\u7891\u5417\uff1f<\/li>\n<li>\u6211\u4eec\u4f1a\u4f7f\u7528\u9879\u76ee\u59d4\u5458\u4f1a\uff08\u9879\u76ee\uff09\u5417\uff1f<\/li>\n<li>\u6211\u4eec\u662f\u5426\u9700\u8981\u7528\u4e8e\u95ee\u9898\u6216\u62c9\u53d6\u8bf7\u6c42\u7684\u6a21\u677f\/\u5143\u7d20\uff08\u4f8b\u5982\u8fd0\u8f93\u6e05\u5355\uff09\uff1f<\/li>\n<li>\u6211\u4eec\u5c06\u5982\u4f55\u8868\u793a\u7b7e\u6536\u8bf7\u6c42\uff1f<\/li>\n<li>\u8c01\u5c06\u5408\u5e76\u8bf7\u6c42\uff1f<\/li>\n<\/ul>\n<p>\u8bf7\u8bb0\u4f4f\uff0c\u5206\u652f\u7684\u529b\u91cf\u6765\u81ea\u4e00\u4e2a\u5b89\u5168\u7684\u5730\u65b9\u8fdb\u884c\u66f4\u6539\uff0c\u5e76\u6709\u6743\u5ba1\u67e5\u548c\u6d4b\u8bd5\u62c9\u8bf7\u6c42\u3002\u5f53\u4f60\u51b3\u5b9a\u56e2\u961f\u7684\u5206\u652f\u671f\u671b\u65f6\uff0c\u4fdd\u6301\u8f7b\u91cf\u7ea7\uff0c\u6613\u4e8e\u5b66\u4e60\u3002\u4e13\u6ce8\u4e8e\u534f\u4f5c\u3002<\/p>\n<h3 class=\"ph\">\u5904\u7406\u5408\u5e76\u51b2\u7a81<\/h3>\n<p>\u5f53\u4f60\u548c\u4e00\u4e2a\u56e2\u961f\u4e00\u8d77\u5de5\u4f5c\uff08\u751a\u81f3\u6709\u65f6\u5019\u4f60\u72ec\u81ea\u4e00\u4eba\u5de5\u4f5c\uff09\uff0c\u4f60\u5076\u5c14\u4f1a\u4ea7\u751f\u5408\u5e76\u51b2\u7a81\u3002\u8d77\u521d\uff0c\u5408\u5e76\u51b2\u7a81\u53ef\u80fd\u662f\u4ee4\u4eba\u6050\u60e7\u7684\uff0c\u4f46\u89e3\u51b3\u5b83\u4eec\u5176\u5b9e\u5f88\u7b80\u5355\u3002<\/p>\n<p>\u8ba9\u6211\u4eec\u5c1d\u8bd5\u521b\u5efa\u4e00\u4e2a\u5408\u5e76\u51b2\u7a81\uff0c\u770b\u770b\u4f1a\u53d1\u751f\u4ec0\u4e48\u3002<\/p>\n<h3 class=\"ph\">\u521b\u5efa\u5177\u6709\u51b2\u7a81\u63d0\u4ea4\u7684\u591a\u4e2a\u5206\u652f<\/h3>\n<p>\u6211\u4eec\u77e5\u9053\u5408\u5e76\u51b2\u7a81\u662f\u5728\u591a\u4e2a\u63d0\u4ea4\u5230\u76f8\u540c\u6587\u4ef6\u7684\u76f8\u540c\u90e8\u5206\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u7684\u3002\u6240\u4ee5\uff0c\u8981\u7ec3\u4e60\uff0c\u8ba9\u6211\u4eec\u6765\u8bbe\u7f6e\u3002<\/p>\n<ol>\n<li>\u4ecemaster\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\uff08new-branch-1\uff09\uff0c\u66f4\u6539README.md\u6587\u4ef6\uff0c\u5e76\u521b\u5efa\u4e00\u4e2apull\u8bf7\u6c42\uff1a\n<ol type=\"a\">\n<li>\u8f93\u5165\u547d\u4ee4\uff1a <code>git checkout -b new-branch-1<\/code><\/li>\n<li>\u66f4\u6539\u5b58\u50a8\u5e93\u4e2d\u7684README.md\u6587\u4ef6\u3002\u8bb0\u4e0b\u4f60\u6539\u53d8\u7684\u54ea\u4e00\u884c\u3002<\/li>\n<li>\u5728\u65b0\u5206\u652f1\u4e0a\uff0c\u6dfb\u52a0\u5e76\u63d0\u4ea4\u66f4\u6539\uff1a\n<ol type=\"i\">\n<li>\u8f93\u5165\u547d\u4ee4\uff1a <code>git add README.md\u00a0<\/code><\/li>\n<li>\u8f93\u5165\u547d\u4ee4\uff1a <code>git commit -m \"Changes to the README\"<\/code><br \/>\n\u6ce8\u610f\uff1a\u5728\u6b63\u5e38\u7684\u5b9e\u8df5\u4e2d\uff0c\u6211\u4eec\u4e0d\u5efa\u8bae\u76f4\u63a5\u5411\u4e3b\u4eba\u63d0\u4ea4 &#8211; \u6211\u4eec\u53ea\u662f\u5728\u8fd9\u91cc\u505a\uff0c\u5b83\u5f88\u5feb\u5c31\u4f1a\u9020\u6210\u5408\u5e76\u51b2\u7a81\u3002<\/li>\n<\/ol>\n<\/li>\n<li>\u5c06\u5206\u652f\u63a8\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff1a\u00a0<code>git push -u origin new-branch-1<\/code><\/li>\n<li>\u6253\u5f00GitHub\u5e76\u4e3a\u6b64\u63d0\u4ea4\u521b\u5efa\u4e00\u4e2a\u62c9\u53d6\u8bf7\u6c42<\/li>\n<\/ol>\n<\/li>\n<li>\u73b0\u5728\uff0c\u4e3a\u4e86\u521b\u5efa\u4e0b\u4e00\u4e2a\u5206\u652f\u548c\u62c9\u53d6\u8bf7\u6c42\uff0c\u8bf7\u68c0\u67e5\u8fd4\u56de\u7ed9master\uff1a<br \/>\n<code>git checkout master<\/code><\/li>\n<li>\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\uff08new-branch-2\uff09\uff0c\u5bf9\u540c\u4e00\u4e2a\u6587\u4ef6\u8fdb\u884c\u66f4\u6539\u5e76\u521b\u5efa\u4e00\u4e2apull\u8bf7\u6c42\uff1a\n<ol type=\"a\">\n<li>\u8f93\u5165\u547d\u4ee4\uff1a <code>git checkout -b new-branch-2<\/code><\/li>\n<li>\u5c06README.md\u6587\u4ef6\u66f4\u6539\u4e3a\u6587\u4ef6\u7684\u540c\u4e00\u884c\u3002<\/li>\n<li>\u8f93\u5165\u547d\u4ee4:\u00a0<code>git add README.md<\/code><\/li>\n<li>\u8f93\u5165\u547d\u4ee4:\u00a0<code>git commit -m \u201cMore changes to the README\u201d<\/code><\/li>\n<li>\u8f93\u5165\u547d\u4ee4:\u00a0<code>git push -u origin new-branch-2<\/code><\/li>\n<li>\u5728GitHub\u4e2d\uff0c\u521b\u5efa\u4e00\u4e2a\u62c9\u8bf7\u6c42<\/li>\n<\/ol>\n<\/li>\n<\/ol>\n<h3 class=\"ph\">\u5408\u5e76\u4e00\u4e2a\u8bf7\u6c42<\/h3>\n<p>\u5230\u76ee\u524d\u4e3a\u6b62\uff0c\u4e24\u4e2a\u5206\u652f\u90fd\u6ca1\u6709\u5408\u5e76\u51b2\u7a81\u3002\u5728GitHub\u4e2d\uff0c\u5408\u5e76\u60a8\u7684\u7b2c\u4e00\u4e2a\u8bf7\u6c42\uff08\u6765\u81eanew-branch-1\uff09\u3002<\/p>\n<h3 class=\"ph\">\u89e3\u51b3\u5bf9\u65b9\u7684\u51b2\u7a81<\/h3>\n<p>\u5408\u5e76<strong>new-branch-1<\/strong>\u7684\u62c9\u53d6\u8bf7\u6c42\u540e\uff0c\u8f6c\u5230\u00a0<strong>new-branch-2<\/strong>\u7684\u62c9\u53d6\u8bf7\u6c42\u3002<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/res.cloudinary.com\/hy4kyit2a\/image\/upload\/v1498165886\/doc\/trailhead\/staging\/team-trailhead_get-started-with-salesforce-dx_en-us_git-and-git-hub-basics_images_5-conflicts_801d33ccc2a0453d8de6152136b646a5.png\" alt=\"Screenshot showing merge conflict in GitHub.\" width=\"624\" height=\"213\" \/><\/p>\n<p>\u4f60\u4f1a\u770b\u5230\u6709\u4e00\u4e2a\u5408\u5e76\u51b2\u7a81\uff01\u4e0d\u8981\u60ca\u614c\uff0c\u4f60\u53ef\u4ee5\u901a\u8fc7\u8fd9\u4e2a\u3002\u6839\u636e\u5408\u5e76\u51b2\u7a81\u7684\u590d\u6742\u7a0b\u5ea6\uff0c\u60a8\u53ef\u4ee5\u9009\u62e9\u5728GitHub\u4e0a\u7684\u6d4f\u89c8\u5668\u4e2d\u89e3\u51b3\u51b2\u7a81\uff0c\u4e5f\u53ef\u80fd\u9700\u8981\u5728\u672c\u5730\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n<p>\u8981\u5728\u672c\u5730\u89e3\u51b3\u5b83\uff0c\u60a8\u5c06\u5408\u5e76\u5230\u60a8\u7684\u5206\u652f\uff0c\u89e3\u51b3\u51b2\u7a81\uff0c\u7136\u540e\u518d\u5b8c\u6210\u5408\u5e76\u3002<\/p>\n<ol>\n<li>\u7b7e\u51fa\u6709\u51b2\u7a81\u7684\u5206\u652f:\u00a0<code>git checkout new-branch-2<\/code><\/li>\n<li>\u786e\u4fdd\u4f60\u7684\u672c\u5730\u4ed3\u5e93\u662f\u6700\u65b0\u7684:\u00a0<code>git pull<\/code><\/li>\n<li>\u5408\u5e76\u4e3b\u529f\u80fd\u5206\u652f\uff1agit merge origin \/ master\u6ce8\u610f\u4f60\u6b63\u5728\u5408\u5e76\u8fdc\u7a0b\u8ffd\u8e2a\u5206\u652f\uff0c\u800c\u4e0d\u662f\u4f60\u7684\u672c\u5730\u4e3b\u526f\u672c &#8211; \u8fd9\u662f\u56e0\u4e3apull\u547d\u4ee4\u66f4\u65b0\u4e86\u8fdc\u7a0b\u5206\u652f\u548c\u4f60\u6b63\u5728\u4f7f\u7528\u7684\u5206\u652f\uff0c\u4f46\u6ca1\u6709\u66f4\u65b0\u4e3b\u5206\u652f\u3002<\/li>\n<li>\u5f53\u4f60\u770b\u5230\u6709\u51b2\u7a81\u7684\u65f6\u5019\uff0c\u6ca1\u5173\u7cfb\uff01\u8f93\u5165git status\u6765\u9a8c\u8bc1\u54ea\u4e2a\u6587\u4ef6\u6709\u51b2\u7a81\u3002\u6709\u51b2\u7a81\u7684\u6587\u4ef6\u5217\u5728<code>Unmerged Paths<\/code>\u4e0b\u3002<\/li>\n<li>\u5728\u6587\u672c\u7f16\u8f91\u5668\u4e2d\u6253\u5f00\u8be5\u6587\u4ef6\uff0c\u7136\u540e\u67e5\u627e\u5408\u5e76\u51b2\u7a81\u6807\u8bb0\u3002(<code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code>,\u00a0<code>=======<\/code>,\u00a0<code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/code>)<\/li>\n<li>\u4e24\u4e2a\u5206\u652f\u7684\u4ee3\u7801\u7248\u672c\u90fd\u5b58\u5728 &#8211; \u9009\u62e9\u4f60\u60f3\u8981\u4fdd\u7559\u7684\u4ee3\u7801\u5e76\u5220\u9664\u5176\u4ed6\u4ee3\u7801\u3002\u786e\u4fdd\u5220\u9664\u7531Git\u521b\u5efa\u7684\u5408\u5e76\u51b2\u7a81\u6807\u8bb0\u5e76\u4fdd\u5b58\u66f4\u6539\u3002<\/li>\n<li>\u6dfb\u52a0\u5e76\u63d0\u4ea4\u4fdd\u5b58\u7684\u66f4\u6539\u4ee5\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\uff1a\n<ol type=\"a\">\n<li>\u8f93\u5165\u547d\u4ee4\uff1a <code>git add README.md<\/code><\/li>\n<li>\u8f93\u5165\u547d\u4ee4\uff1a <code>git commit -m \u201cCommit to resolve merge conflict\u201d<\/code><\/li>\n<\/ol>\n<\/li>\n<li>\u5c06\u529f\u80fd\u5206\u652f\u63a8\u5230\u8fdc\u7a0b\uff1a <code>git push<\/code><\/li>\n<li>\u56de\u5230GitHub\u7684pull\u8bf7\u6c42\u3002\u62c9\u8bf7\u6c42\u73b0\u5728\u6ca1\u6709\u51b2\u7a81\u3002\u6ca1\u6709\u51b2\u7a81\u7684\u5206\u652f\u5c4f\u5e55\u622a\u56fe\u3002<img decoding=\"async\" src=\"https:\/\/res.cloudinary.com\/hy4kyit2a\/image\/upload\/v1498165887\/doc\/trailhead\/staging\/team-trailhead_get-started-with-salesforce-dx_en-us_git-and-git-hub-basics_images_5-noconflicts_cc20a0ecf5a083a02ab9d798fb0b4231.png\" alt=\"Screenshot of branch with no conflicts.\" \/><\/li>\n<li>\u5408\u5e76\u62c9\u53d6\u8bf7\u6c42\u3002<\/li>\n<\/ol>\n<p>\u73b0\u5728\u6211\u4eec\u5df2\u7ecf\u5b8c\u6210\u4e86\u8fd9\u4e9b\u5206\u652f\uff0c\u5728GitHub\u4e2d\u5220\u9664\u5b83\u4eec\uff0c\u7136\u540e\u4f7f\u7528git checkout master\u548cgit pull\u547d\u4ee4\u6765\u540c\u6b65\u60a8\u7684\u672c\u5730\u5b58\u50a8\u5e93\u3002<\/p>\n<h3 class=\"ph\">\u5de5\u827a\u539f\u5b50\u63d0\u4ea4<\/h3>\n<p>\u7f16\u5199\u539f\u5b50\u63d0\u4ea4\u662f\u521b\u5efa\u9879\u76ee\u53ef\u8bfb\u548c\u4fe1\u606f\u4e30\u5bcc\u7684\u5386\u53f2\u7684\u91cd\u8981\u7ec4\u6210\u90e8\u5206\u3002<\/p>\n<p>\u5728\u4e00\u4e2a\u5b8c\u7f8e\u7684\u4e16\u754c\u91cc\uff0c\u4f60\u6c38\u8fdc\u4e0d\u9700\u8981\u53bb\u770b\u6216\u6539\u53d8\u4f60\u7684\u5386\u53f2\u3002\u7136\u800c\uff0c\u6211\u4eec\u5e76\u4e0d\u662f\u751f\u6d3b\u5728\u4e00\u4e2a\u5b8c\u7f8e\u7684\u4e16\u754c\uff0c\u6240\u4ee5\u7248\u672c\u63a7\u5236\u8ba9\u6211\u4eec\u5728\u5fc5\u8981\u7684\u65f6\u5019\u67e5\u770b\u6211\u4eec\u7684\u53d8\u5316\u5386\u53f2\u3002\u6bcf\u4e2a\u63d0\u4ea4\u90fd\u5e94\u8be5\u662f\u4e00\u4e2a\u5c0f\u5c0f\u7684\u903b\u8f91\u53d8\u5316\u5355\u5143\uff0c\u5e76\u8bb2\u8ff0\u4f60\u7684\u5b58\u50a8\u5e93\u7684\u6545\u4e8b\u3002<\/p>\n<p>\u8ba9\u6211\u4eec\u7ec3\u4e60\u4e00\u4e2a\u547d\u4ee4\u6765\u5e2e\u52a9\u60a8\u5b8c\u6210\u539f\u5b50\u63d0\u4ea4\uff0cgit add &#8211;patch\u6216git add -p\u3002\u8fd9\u4e2a\u547d\u4ee4\u53ef\u4ee5\u8ba9\u60a8\u5c06\u6587\u4ef6\u7684\u4e0d\u540c\u90e8\u5206\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u57df\uff0c\u5e2e\u52a9\u60a8\u8fdb\u884c\u786e\u5b9e\u662f\u903b\u8f91\u5355\u5143\u66f4\u6539\u7684\u63d0\u4ea4\u3002<\/p>\n<ol>\n<li>\u5c06\u00a0<a href=\"https:\/\/developer.salesforce.com\/files\/bigFile.md\" target=\"_blank\" rel=\"noopener\">bigFile.md<\/a>\u00a0\u4e0b\u8f7d\u5230\u60a8\u7684\u8ba1\u7b97\u673a\uff08\u60a8\u53ef\u80fd\u9700\u8981\u53f3\u952e\u5355\u51fb\u5e76\u9009\u62e9\u00a0<strong>Save Target A<\/strong>\uff09<\/li>\n<li>\u5728GitHub\u4e2d\uff0c\u5c06bigFile.md\u4e0a\u4f20\u5230\u6700\u597d\u7684\u4ed3\u5e93\u4e2d\u7684master\u5206\u652f\uff1a\n<ol type=\"a\">\n<li>\u70b9\u51fb <strong>Upload files<\/strong><\/li>\n<li>\u4ece\u60a8\u7684\u7535\u8111\u4e2d\u9009\u62e9 <strong>bigFile.md<\/strong><\/li>\n<li>\u9009\u62e9 <strong>Commit directly to the master branch<\/strong><\/li>\n<li>\u70b9\u51fb <strong>Commit changes<\/strong><\/li>\n<\/ol>\n<\/li>\n<li>\u786e\u4fdd\u60a8\u7684\u672c\u5730\u4e3b\u5b58\u50a8\u5e93\u662f\u6700\u65b0\u7684\uff1a\n<ol type=\"a\">\n<li>\u8f93\u5165\u547d\u4ee4: <code>git checkout master<\/code><\/li>\n<li>\u8f93\u5165\u547d\u4ee4:\u00a0<code>git pull<\/code><\/li>\n<\/ol>\n<\/li>\n<li>\u770b\u770bgit\u8ddf\u8e2a\u7684\u662f\u4ec0\u4e48\uff1a <code>git status<\/code><br \/>\n\u4f60\u5e94\u8be5\u770b\u5230\u6ca1\u6709\u4ec0\u4e48\u53ef\u4ee5\u63d0\u4ea4\u7684\u3002<\/li>\n<li>\u5bf9\u7b2c1\u884c\u548c\u7b2c100\u884c\u4e0a\u7684bigFile.md\u8fdb\u884c\u66f4\u6539\uff08\u4fee\u6539\u5185\u5bb9\u65e0\u5173\u7d27\u8981\uff09\u3002<\/li>\n<li>\u4f7f\u7528&#8211;patch\u6807\u5fd7\u5c06\u4e00\u4e9b\u6587\u4ef6\u7684\u67d0\u4e9b\u90e8\u5206\u79fb\u81f3\u6682\u5b58\u533a\uff1a <code>git add -p<\/code><\/li>\n<li>\u6309y\u6216n\u9009\u62e9\u662f\u5426\u653e\u5f03hunk\u3002<\/li>\n<\/ol>\n<p>\u60f3\u77e5\u9053\u4e3a\u4ec0\u4e48\u6240\u6709\u8fd9\u4e9b\u5176\u4ed6\u9009\u9879\u662f\u4e3a\u4eba\uff1f\u4f7f\u7528 \uff1f\u67e5\u770b\u5927\u5757\u4ee5\u4e0a\u7684\u9009\u9879\u5217\u8868\u3002<\/p>\n<\/div>\n","protected":false},"excerpt":{"rendered":"<p>\u5b66\u4e60\u76ee\u6807 \u5b8c\u6210\u672c\u5355\u5143\u540e\uff0c\u60a8\u5c06\u80fd\u591f\uff1a \u5c06GitHub\u5de5\u4f5c\u6d41\u8f6c\u6362\u4e3a\u9002\u7528\u4e8e\u56e2\u961f\u7684\u6709\u6548\u5206\u652f\u7b56\u7565\u3002 \u89e3\u51b3GitHub\u4e0a\u7684 &hellip; <a href=\"http:\/\/www.ponybai.com\/?p=882\" class=\"more-link\">\u7ee7\u7eed\u9605\u8bfb<span class=\"screen-reader-text\">\u7248\u672c\u63a7\u5236\uff085\uff09<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[164],"tags":[],"class_list":["post-882","post","type-post","status-publish","format-standard","hentry","category-github"],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v21.7 - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u7248\u672c\u63a7\u5236\uff085\uff09 - \u767d\u767d\u968f\u7b14<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"http:\/\/www.ponybai.com\/?p=882\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u7248\u672c\u63a7\u5236\uff085\uff09 - \u767d\u767d\u968f\u7b14\" \/>\n<meta property=\"og:description\" content=\"\u5b66\u4e60\u76ee\u6807 \u5b8c\u6210\u672c\u5355\u5143\u540e\uff0c\u60a8\u5c06\u80fd\u591f\uff1a \u5c06GitHub\u5de5\u4f5c\u6d41\u8f6c\u6362\u4e3a\u9002\u7528\u4e8e\u56e2\u961f\u7684\u6709\u6548\u5206\u652f\u7b56\u7565\u3002 \u89e3\u51b3GitHub\u4e0a\u7684 &hellip; \u7ee7\u7eed\u9605\u8bfb\u7248\u672c\u63a7\u5236\uff085\uff09\" \/>\n<meta property=\"og:url\" content=\"http:\/\/www.ponybai.com\/?p=882\" \/>\n<meta property=\"og:site_name\" content=\"\u767d\u767d\u968f\u7b14\" \/>\n<meta property=\"article:published_time\" content=\"2018-01-30T05:49:47+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/res.cloudinary.com\/hy4kyit2a\/image\/upload\/v1498165883\/doc\/trailhead\/staging\/team-trailhead_get-started-with-salesforce-dx_en-us_git-and-git-hub-basics_images_5-branching_b5c10c45c3d9ac011d76cecabb4e4fce.png\" \/>\n<meta name=\"author\" content=\"ponybai\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"ponybai\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"http:\/\/www.ponybai.com\/?p=882#article\",\"isPartOf\":{\"@id\":\"http:\/\/www.ponybai.com\/?p=882\"},\"author\":{\"name\":\"ponybai\",\"@id\":\"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883\"},\"headline\":\"\u7248\u672c\u63a7\u5236\uff085\uff09\",\"datePublished\":\"2018-01-30T05:49:47+00:00\",\"dateModified\":\"2018-01-30T05:49:47+00:00\",\"mainEntityOfPage\":{\"@id\":\"http:\/\/www.ponybai.com\/?p=882\"},\"wordCount\":76,\"publisher\":{\"@id\":\"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883\"},\"articleSection\":[\"GitHub\"],\"inLanguage\":\"zh-Hans\"},{\"@type\":\"WebPage\",\"@id\":\"http:\/\/www.ponybai.com\/?p=882\",\"url\":\"http:\/\/www.ponybai.com\/?p=882\",\"name\":\"\u7248\u672c\u63a7\u5236\uff085\uff09 - \u767d\u767d\u968f\u7b14\",\"isPartOf\":{\"@id\":\"http:\/\/www.ponybai.com\/#website\"},\"datePublished\":\"2018-01-30T05:49:47+00:00\",\"dateModified\":\"2018-01-30T05:49:47+00:00\",\"breadcrumb\":{\"@id\":\"http:\/\/www.ponybai.com\/?p=882#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"http:\/\/www.ponybai.com\/?p=882\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"http:\/\/www.ponybai.com\/?p=882#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"http:\/\/www.ponybai.com\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u7248\u672c\u63a7\u5236\uff085\uff09\"}]},{\"@type\":\"WebSite\",\"@id\":\"http:\/\/www.ponybai.com\/#website\",\"url\":\"http:\/\/www.ponybai.com\/\",\"name\":\"\u767d\u767d\u968f\u7b14\",\"description\":\"Salesforce\u5b98\u65b9\u8bb2\u5e08\",\"publisher\":{\"@id\":\"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"http:\/\/www.ponybai.com\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"zh-Hans\"},{\"@type\":[\"Person\",\"Organization\"],\"@id\":\"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883\",\"name\":\"ponybai\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"http:\/\/www.ponybai.com\/#\/schema\/person\/image\/\",\"url\":\"http:\/\/www.ponybai.com\/wp-content\/uploads\/2025\/03\/cropped-Ihsans-WeChatQR.jpg\",\"contentUrl\":\"http:\/\/www.ponybai.com\/wp-content\/uploads\/2025\/03\/cropped-Ihsans-WeChatQR.jpg\",\"width\":248,\"height\":248,\"caption\":\"ponybai\"},\"logo\":{\"@id\":\"http:\/\/www.ponybai.com\/#\/schema\/person\/image\/\"},\"sameAs\":[\"http:\/\/121.37.188.161\"],\"url\":\"http:\/\/www.ponybai.com\/?author=1\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"\u7248\u672c\u63a7\u5236\uff085\uff09 - \u767d\u767d\u968f\u7b14","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"http:\/\/www.ponybai.com\/?p=882","og_locale":"zh_CN","og_type":"article","og_title":"\u7248\u672c\u63a7\u5236\uff085\uff09 - \u767d\u767d\u968f\u7b14","og_description":"\u5b66\u4e60\u76ee\u6807 \u5b8c\u6210\u672c\u5355\u5143\u540e\uff0c\u60a8\u5c06\u80fd\u591f\uff1a \u5c06GitHub\u5de5\u4f5c\u6d41\u8f6c\u6362\u4e3a\u9002\u7528\u4e8e\u56e2\u961f\u7684\u6709\u6548\u5206\u652f\u7b56\u7565\u3002 \u89e3\u51b3GitHub\u4e0a\u7684 &hellip; \u7ee7\u7eed\u9605\u8bfb\u7248\u672c\u63a7\u5236\uff085\uff09","og_url":"http:\/\/www.ponybai.com\/?p=882","og_site_name":"\u767d\u767d\u968f\u7b14","article_published_time":"2018-01-30T05:49:47+00:00","og_image":[{"url":"https:\/\/res.cloudinary.com\/hy4kyit2a\/image\/upload\/v1498165883\/doc\/trailhead\/staging\/team-trailhead_get-started-with-salesforce-dx_en-us_git-and-git-hub-basics_images_5-branching_b5c10c45c3d9ac011d76cecabb4e4fce.png"}],"author":"ponybai","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"ponybai","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"http:\/\/www.ponybai.com\/?p=882#article","isPartOf":{"@id":"http:\/\/www.ponybai.com\/?p=882"},"author":{"name":"ponybai","@id":"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883"},"headline":"\u7248\u672c\u63a7\u5236\uff085\uff09","datePublished":"2018-01-30T05:49:47+00:00","dateModified":"2018-01-30T05:49:47+00:00","mainEntityOfPage":{"@id":"http:\/\/www.ponybai.com\/?p=882"},"wordCount":76,"publisher":{"@id":"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883"},"articleSection":["GitHub"],"inLanguage":"zh-Hans"},{"@type":"WebPage","@id":"http:\/\/www.ponybai.com\/?p=882","url":"http:\/\/www.ponybai.com\/?p=882","name":"\u7248\u672c\u63a7\u5236\uff085\uff09 - \u767d\u767d\u968f\u7b14","isPartOf":{"@id":"http:\/\/www.ponybai.com\/#website"},"datePublished":"2018-01-30T05:49:47+00:00","dateModified":"2018-01-30T05:49:47+00:00","breadcrumb":{"@id":"http:\/\/www.ponybai.com\/?p=882#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["http:\/\/www.ponybai.com\/?p=882"]}]},{"@type":"BreadcrumbList","@id":"http:\/\/www.ponybai.com\/?p=882#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"http:\/\/www.ponybai.com\/"},{"@type":"ListItem","position":2,"name":"\u7248\u672c\u63a7\u5236\uff085\uff09"}]},{"@type":"WebSite","@id":"http:\/\/www.ponybai.com\/#website","url":"http:\/\/www.ponybai.com\/","name":"\u767d\u767d\u968f\u7b14","description":"Salesforce\u5b98\u65b9\u8bb2\u5e08","publisher":{"@id":"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"http:\/\/www.ponybai.com\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"zh-Hans"},{"@type":["Person","Organization"],"@id":"http:\/\/www.ponybai.com\/#\/schema\/person\/935c7592c850c65e1e5eba4530dbf883","name":"ponybai","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"http:\/\/www.ponybai.com\/#\/schema\/person\/image\/","url":"http:\/\/www.ponybai.com\/wp-content\/uploads\/2025\/03\/cropped-Ihsans-WeChatQR.jpg","contentUrl":"http:\/\/www.ponybai.com\/wp-content\/uploads\/2025\/03\/cropped-Ihsans-WeChatQR.jpg","width":248,"height":248,"caption":"ponybai"},"logo":{"@id":"http:\/\/www.ponybai.com\/#\/schema\/person\/image\/"},"sameAs":["http:\/\/121.37.188.161"],"url":"http:\/\/www.ponybai.com\/?author=1"}]}},"_links":{"self":[{"href":"http:\/\/www.ponybai.com\/index.php?rest_route=\/wp\/v2\/posts\/882","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/www.ponybai.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.ponybai.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.ponybai.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.ponybai.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=882"}],"version-history":[{"count":0,"href":"http:\/\/www.ponybai.com\/index.php?rest_route=\/wp\/v2\/posts\/882\/revisions"}],"wp:attachment":[{"href":"http:\/\/www.ponybai.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=882"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.ponybai.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=882"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.ponybai.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=882"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}