{"id":348,"date":"2026-01-26T00:36:51","date_gmt":"2026-01-25T16:36:51","guid":{"rendered":"https:\/\/skwp.zeabur.app\/2026\/01\/26\/%e3%80%90github-flow-%e6%95%99%e5%ad%b8%e3%80%9104-%e5%90%88%e4%bd%b5%e8%88%87%e9%83%a8%e7%bd%b2%ef%bc%9a%e5%be%9e-pr-%e5%88%b0%e4%b8%8a%e7%b7%9a\/"},"modified":"2026-01-26T00:36:51","modified_gmt":"2026-01-25T16:36:51","slug":"%e3%80%90github-flow-%e6%95%99%e5%ad%b8%e3%80%9104-%e5%90%88%e4%bd%b5%e8%88%87%e9%83%a8%e7%bd%b2%ef%bc%9a%e5%be%9e-pr-%e5%88%b0%e4%b8%8a%e7%b7%9a","status":"publish","type":"post","link":"https:\/\/blog.itsmygo.uk\/wordpress\/2026\/01\/26\/%e3%80%90github-flow-%e6%95%99%e5%ad%b8%e3%80%9104-%e5%90%88%e4%bd%b5%e8%88%87%e9%83%a8%e7%bd%b2%ef%bc%9a%e5%be%9e-pr-%e5%88%b0%e4%b8%8a%e7%b7%9a\/","title":{"rendered":"\u3010GitHub Flow \u6559\u5b78\u3011#04 \u5408\u4f75\u8207\u90e8\u7f72\uff1a\u5f9e PR \u5230\u4e0a\u7dda"},"content":{"rendered":"\n<div id=\"quiz-basic\">\n<style>\n#quiz-basic .question {\n        background: white;\n        border-radius: 8px;\n        padding: 20px;\n        margin: 20px 0;\n        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);\n      }#quiz-basic .question h3 {\n        margin-top: 0;\n        color: #333;\n      }#quiz-basic .options {\n        list-style: none;\n        padding: 0;\n      }#quiz-basic .options li {\n        padding: 12px 15px;\n        margin: 8px 0;\n        border: 2px solid #ddd;\n        border-radius: 6px;\n        cursor: pointer;\n        transition: all 0.2s;\n      }#quiz-basic .options li:hover:not(.disabled) {\n        border-color: #4caf50;\n        background: #f0fff0;\n      }#quiz-basic .options li.correct {\n        border-color: #4caf50;\n        background: #e8f5e9;\n      }#quiz-basic .options li.wrong {\n        border-color: #f44336;\n        background: #ffebee;\n      }#quiz-basic .options li.disabled {\n        cursor: default;\n        opacity: 0.7;\n      }#quiz-basic .options li.show-answer {\n        border-color: #4caf50;\n        background: #e8f5e9;\n      }#quiz-basic .feedback {\n        margin-top: 15px;\n        padding: 12px;\n        border-radius: 6px;\n        display: none;\n      }#quiz-basic .feedback.correct {\n        background: #e8f5e9;\n        color: #2e7d32;\n        display: block;\n      }#quiz-basic .feedback.wrong {\n        background: #ffebee;\n        color: #c62828;\n        display: block;\n      }#quiz-basic .score {\n        text-align: center;\n        font-size: 1.5em;\n        padding: 20px;\n        background: white;\n        border-radius: 8px;\n        margin-top: 20px;\n      }#quiz-basic .code-block {\n        background: #1e1e1e;\n        color: #d4d4d4;\n        padding: 14px;\n        border-radius: 6px;\n        font-family: \"Monaco\", \"Consolas\", \"Courier New\", monospace;\n        font-size: 0.9em;\n        overflow-x: auto;\n        margin: 12px 0;\n        white-space: pre-wrap;\n      }\n<\/style>\n<h1>\u6e2c\u9a57\uff1aGitHub Flow &#8211; \u5408\u4f75\u8207\u90e8\u7f72<\/h1>\n    <p>\u5171 5 \u984c\uff0c\u9ede\u9078\u7b54\u6848\u5f8c\u6703\u7acb\u5373\u986f\u793a\u7d50\u679c<\/p>\n\n    <div class=\"question\" id=\"q1\">\n      <h3>1. \u5728 GitHub \u4e0a\u5408\u4f75 PR \u4e4b\u524d\uff0c\u9700\u8981\u78ba\u8a8d\u54ea\u4e9b\u689d\u4ef6\u90fd\u901a\u904e\uff1f<\/h3>\n      <ul class=\"options\">\n        <li onclick=\"checkAnswer(1, 'A', 'D')\">A. \u53ea\u9700\u8981 CI \u6e2c\u8a66\u901a\u904e\u5373\u53ef<\/li>\n        <li onclick=\"checkAnswer(1, 'B', 'D')\">B. \u53ea\u9700\u8981\u6709\u4eba\u5be9\u6838\u6279\u51c6\u5373\u53ef<\/li>\n        <li onclick=\"checkAnswer(1, 'C', 'D')\">C. \u53ea\u9700\u8981\u6c92\u6709\u5408\u4f75\u885d\u7a81\u5373\u53ef<\/li>\n        <li onclick=\"checkAnswer(1, 'D', 'D')\">D. CI \u901a\u904e\u3001\u5be9\u6838\u6279\u51c6\u3001\u7121\u885d\u7a81\uff0c\u4e09\u8005\u90fd\u8981\u6eff\u8db3<\/li>\n      <\/ul>\n      <div class=\"feedback\" id=\"fb1\"><\/div>\n    <\/div>\n\n    <div class=\"question\" id=\"q2\">\n      <h3>2. \u300cSquash and merge\u300d\u5408\u4f75\u7b56\u7565\u7684\u7279\u9ede\u662f\u4ec0\u9ebc\uff1f<\/h3>\n      <ul class=\"options\">\n        <li onclick=\"checkAnswer(2, 'A', 'B')\">A. \u4fdd\u7559\u6240\u6709 commit \u6b77\u53f2\uff0c\u7522\u751f\u4e00\u500b\u5408\u4f75\u9ede<\/li>\n        <li onclick=\"checkAnswer(2, 'B', 'B')\">B. \u628a feature \u5206\u652f\u7684\u6240\u6709 commit \u58d3\u6210\u4e00\u500b<\/li>\n        <li onclick=\"checkAnswer(2, 'C', 'B')\">C. \u628a commit \u8907\u88fd\u4e00\u4efd\u63a5\u5728 main \u5f8c\u9762\uff0c\u5f62\u6210\u76f4\u7dda<\/li>\n        <li onclick=\"checkAnswer(2, 'D', 'B')\">D. \u81ea\u52d5\u522a\u9664\u6240\u6709 commit \u6b77\u53f2<\/li>\n      <\/ul>\n      <div class=\"feedback\" id=\"fb2\"><\/div>\n    <\/div>\n\n    <div class=\"question\" id=\"q3\">\n      <h3>3. \u5408\u4f75 PR \u5f8c\uff0c\u70ba\u4ec0\u9ebc\u5efa\u8b70\u522a\u9664 feature \u5206\u652f\uff1f<\/h3>\n      <ul class=\"options\">\n        <li onclick=\"checkAnswer(3, 'A', 'C')\">A. \u56e0\u70ba\u522a\u9664\u5206\u652f\u53ef\u4ee5\u52a0\u5feb\u7a0b\u5f0f\u57f7\u884c\u901f\u5ea6<\/li>\n        <li onclick=\"checkAnswer(3, 'B', 'C')\">B. \u56e0\u70ba\u5206\u652f\u522a\u9664\u5f8c\u624d\u80fd\u90e8\u7f72\u4e0a\u7dda<\/li>\n        <li onclick=\"checkAnswer(3, 'C', 'C')\">C. \u56e0\u70ba\u5de5\u4f5c\u5df2\u5b8c\u6210\uff0c\u907f\u514d\u5206\u652f\u8d8a\u7a4d\u8d8a\u591a\uff0c\u4e14 main \u5df2\u6709\u9019\u4e9b\u7a0b\u5f0f\u78bc<\/li>\n        <li onclick=\"checkAnswer(3, 'D', 'C')\">D. \u56e0\u70ba GitHub \u5f37\u5236\u8981\u6c42\u522a\u9664\u5206\u652f<\/li>\n      <\/ul>\n      <div class=\"feedback\" id=\"fb3\"><\/div>\n    <\/div>\n\n    <div class=\"question\" id=\"q4\">\n      <h3>4. \u5728 CI\/CD \u6d41\u7a0b\u4e2d\uff0cCI\uff08\u6301\u7e8c\u6574\u5408\uff09\u7684\u4e3b\u8981\u529f\u80fd\u662f\u4ec0\u9ebc\uff1f<\/h3>\n      <ul class=\"options\">\n        <li onclick=\"checkAnswer(4, 'A', 'B')\">A. \u81ea\u52d5\u90e8\u7f72\u7a0b\u5f0f\u78bc\u5230\u4f3a\u670d\u5668<\/li>\n        <li onclick=\"checkAnswer(4, 'B', 'B')\">B. \u6bcf\u6b21\u63a8\u7a0b\u5f0f\u78bc\u6642\u81ea\u52d5\u8dd1\u6e2c\u8a66<\/li>\n        <li onclick=\"checkAnswer(4, 'C', 'B')\">C. \u81ea\u52d5\u5408\u4f75\u6240\u6709 PR<\/li>\n        <li onclick=\"checkAnswer(4, 'D', 'B')\">D. \u81ea\u52d5\u5efa\u7acb\u65b0\u5206\u652f<\/li>\n      <\/ul>\n      <div class=\"feedback\" id=\"fb4\"><\/div>\n    <\/div>\n\n    <div class=\"question\" id=\"q5\">\n      <h3>5. \u7576\u9047\u5230\u5408\u4f75\u885d\u7a81\u6642\uff0c\u4ee5\u4e0b\u54ea\u500b\u63cf\u8ff0\u662f\u6b63\u78ba\u7684\uff1f<\/h3>\n      <div class=\"code-block\"><<<<<<< feature-branch\n    return \"Hello, World!\"\n=======\n    return \"Hi, World!\"\n>>>>>>> main<\/div>\n      <ul class=\"options\">\n        <li onclick=\"checkAnswer(5, 'A', 'D')\">A. <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code> \u548c <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/code> \u4e4b\u9593\u7684\u5167\u5bb9\u6703\u81ea\u52d5\u88ab\u522a\u9664<\/li>\n        <li onclick=\"checkAnswer(5, 'B', 'D')\">B. <code>=======<\/code> \u4e0a\u65b9\u662f main \u7684\u7248\u672c<\/li>\n        <li onclick=\"checkAnswer(5, 'C', 'D')\">C. \u885d\u7a81\u6a19\u8a18\u6703\u7531 GitHub \u81ea\u52d5\u89e3\u6c7a<\/li>\n        <li onclick=\"checkAnswer(5, 'D', 'D')\">D. \u9700\u8981\u624b\u52d5\u6c7a\u5b9a\u4fdd\u7559\u54ea\u500b\u7248\u672c\uff0c\u4e26\u522a\u9664\u885d\u7a81\u6a19\u8a18<\/li>\n      <\/ul>\n      <div class=\"feedback\" id=\"fb5\"><\/div>\n    <\/div>\n\n    <div class=\"score\" id=\"score\" style=\"display:none;\"><\/div>\n<script>\n\n      let answered = 0;\n      let correct = 0;\n      const total = 5;\n      const explanations = {\n        1: \"\u5408\u4f75\u524d\u5fc5\u9808\u78ba\u8a8d\u4e09\u500b\u689d\u4ef6\uff1aCI \u6e2c\u8a66\u901a\u904e\uff08\u7a0b\u5f0f\u78bc\u6c92\u6709\u660e\u986f bug\uff09\u3001\u81f3\u5c11\u4e00\u4eba\u5be9\u6838\u6279\u51c6\u3001\u6c92\u6709\u5408\u4f75\u885d\u7a81\u3002\u5168\u90e8\u7da0\u52fe\u624d\u80fd\u5b89\u5168\u5408\u4f75\u3002\",\n        2: \"Squash and merge \u6703\u5c07 feature \u5206\u652f\u4e0a\u7684\u6240\u6709 commit \u58d3\u7e2e\u6210\u4e00\u500b commit\u3002\u9069\u5408\u5728 commit \u592a\u591a\u592a\u96dc\u4e82\uff0c\u6216\u53ea\u60f3\u4fdd\u7559\u300c\u505a\u4e86\u4ec0\u9ebc\u300d\u800c\u4e0d\u9700\u8981\u300c\u600e\u9ebc\u505a\u7684\u300d\u7d30\u7bc0\u6642\u4f7f\u7528\u3002\",\n        3: \"\u5408\u4f75\u5f8c\u522a\u9664\u5206\u652f\u7684\u539f\u56e0\u662f\uff1a\u8a72\u5206\u652f\u7684\u5de5\u4f5c\u5df2\u7d93\u5b8c\u6210\u3001\u907f\u514d\u5206\u652f\u8d8a\u7a4d\u8d8a\u591a\u9020\u6210\u6df7\u4e82\u3001main \u5206\u652f\u5df2\u7d93\u5305\u542b\u9019\u4e9b\u7a0b\u5f0f\u78bc\u4e86\u3002\",\n        4: \"CI\uff08\u6301\u7e8c\u6574\u5408\uff09\u7684\u529f\u80fd\u662f\u6bcf\u6b21\u63a8\u7a0b\u5f0f\u78bc\u6642\u81ea\u52d5\u8dd1\u6e2c\u8a66\uff0c\u78ba\u4fdd\u7a0b\u5f0f\u78bc\u54c1\u8cea\u3002CD\uff08\u6301\u7e8c\u90e8\u7f72\uff09\u624d\u662f\u8ca0\u8cac\u81ea\u52d5\u90e8\u7f72\u5230\u4f3a\u670d\u5668\u7684\u90e8\u5206\u3002\",\n        5: \"\u9047\u5230\u885d\u7a81\u6642\uff0c<code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; feature-branch<\/code> \u548c <code>=======<\/code> \u4e4b\u9593\u662f\u4f60\u7684\u7248\u672c\uff0c<code>=======<\/code> \u548c <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt; main<\/code> \u4e4b\u9593\u662f main \u7684\u7248\u672c\u3002\u4f60\u9700\u8981\u624b\u52d5\u6c7a\u5b9a\u4fdd\u7559\u54ea\u500b\u7248\u672c\uff08\u6216\u5408\u4f75\u5169\u8005\uff09\uff0c\u7136\u5f8c\u522a\u9664\u6240\u6709\u885d\u7a81\u6a19\u8a18\u3002\"\n      };\n\n      function checkAnswer(qNum, selected, correctAns) {\n        const question = document.getElementById(\"q\" + qNum);\n        if (question.classList.contains(\"answered\")) return;\n\n        question.classList.add(\"answered\");\n        answered++;\n\n        const options = question.querySelectorAll(\".options li\");\n        options.forEach((opt) => {\n          opt.classList.add(\"disabled\");\n          if (opt.textContent.startsWith(correctAns + \".\")) {\n            opt.classList.add(\"show-answer\");\n          }\n        });\n\n        const feedback = document.getElementById(\"fb\" + qNum);\n        if (selected === correctAns) {\n          correct++;\n          feedback.className = \"feedback correct\";\n          feedback.innerHTML = \"\u2713 \u6b63\u78ba\uff01\" + explanations[qNum];\n        } else {\n          feedback.className = \"feedback wrong\";\n          feedback.innerHTML =\n            \"\u2717 \u932f\u8aa4\u3002\u6b63\u78ba\u7b54\u6848\u662f \" + correctAns + \"\u3002\" + explanations[qNum];\n          options.forEach((opt) => {\n            if (opt.textContent.startsWith(selected + \".\")) {\n              opt.classList.add(\"wrong\");\n            }\n          });\n        }\n\n        if (answered === total) {\n          const scoreDiv = document.getElementById(\"score\");\n          scoreDiv.style.display = \"block\";\n          scoreDiv.innerHTML =\n            \"\u6e2c\u9a57\u5b8c\u6210\uff01\u5f97\u5206\uff1a\" +\n            correct +\n            \" \/ \" +\n            total +\n            (correct === total\n              ? \" \ud83c\udf89 \u5168\u5c0d\uff01\"\n              : correct >= Math.ceil(total * 0.6)\n                ? \" \ud83d\udc4d \u4e0d\u932f\uff01\"\n                : \" \ud83d\udcda \u518d\u8907\u7fd2\u4e00\u4e0b\u5427\");\n        }\n      }\n    \n<\/script>\n<\/div>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e00\u53e5\u8a71\u8aaa\u660e<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u628a\u5be9\u6838\u901a\u904e\u7684\u7a0b\u5f0f\u78bc\u5408\u4f75\u5230 main \u5206\u652f\uff0c\u7136\u5f8c\u90e8\u7f72\u4e0a\u7dda\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u9019\u7bc7\u6559\u4f60\u770b\u61c2\u4ec0\u9ebc<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u8b80\u5b8c\u9019\u7bc7\uff0c\u4f60\u80fd\u770b\u61c2\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5408\u4f75\u524d\u8981\u6aa2\u67e5\u4ec0\u9ebc<\/li>\n<li>Merge\u3001Squash\u3001Rebase \u4e09\u7a2e\u5408\u4f75\u6309\u9215\u7684\u5dee\u5225<\/li>\n<li>\u5408\u4f75\u5f8c\u70ba\u4ec0\u9ebc\u8981\u522a\u9664\u5206\u652f<\/li>\n<li>GitHub Flow \u600e\u9ebc\u8ddf\u81ea\u52d5\u90e8\u7f72\u914d\u5408<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u5408\u4f75\u524d\u7684\u6aa2\u67e5\u6e05\u55ae<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728 GitHub \u4e0a\u770b\u5230 PR \u9801\u9762\uff0c\u5408\u4f75\u524d\u78ba\u8a8d\u9019\u4e9b\uff1a<\/p>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-1\" data-shcb-language-name=\"PHP\" data-shcb-language-slug=\"php\"><span><code class=\"hljs language-php\">+------------------------+\n|  Pull Request <span class=\"hljs-comment\">#42      |<\/span>\n+------------------------+\n| Status Checks          |\n| &#91;x] CI passed          |  &lt;-- \u81ea\u52d5\u6e2c\u8a66\u8981\u904e\n| &#91;x] Review approved    |  &lt;-- \u8981\u6709\u4eba\u6279\u51c6\n| &#91;x] No conflicts       |  &lt;-- \u4e0d\u80fd\u6709\u885d\u7a81\n+------------------------+\n| &#91;Merge pull request]   |  &lt;-- \u5168\u90e8\u7da0\u52fe\u624d\u80fd\u9ede\n+------------------------+\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-1\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">PHP<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">php<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7ffb\u8b6f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>CI passed<\/strong>\uff1a\u81ea\u52d5\u5316\u6e2c\u8a66\u8dd1\u904e\u4e86\uff0c\u7a0b\u5f0f\u78bc\u6c92\u6709\u660e\u986f bug<\/li>\n<li><strong>Review approved<\/strong>\uff1a\u81f3\u5c11\u4e00\u500b\u4eba\u770b\u904e\u4e26\u6279\u51c6<\/li>\n<li><strong>No conflicts<\/strong>\uff1a\u4f60\u7684\u4fee\u6539\u8ddf main \u5206\u652f\u6c92\u6709\u885d\u7a81<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e09\u7a2e\u5408\u4f75\u7b56\u7565<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u9ede\u300cMerge pull request\u300d\u65c1\u908a\u7684\u7bad\u982d\uff0c\u6703\u770b\u5230\u4e09\u500b\u9078\u9805\uff1a<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">\u9078\u9805 1\uff1aCreate a merge commit\uff08\u9810\u8a2d\uff09<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\"><span><code class=\"hljs\">main:    A---B-----------M\n              \\         \/\nfeature:       C---D---E\n<\/code><\/span><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7ffb\u8b6f<\/strong>\uff1a\u4fdd\u7559\u6240\u6709 commit \u6b77\u53f2\uff0c\u7522\u751f\u4e00\u500b\u5408\u4f75\u9ede M\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u9069\u5408\u5834\u666f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5927\u90e8\u5206\u60c5\u6cc1\u90fd\u7528\u9019\u500b<\/li>\n<li>\u60f3\u4fdd\u7559\u5b8c\u6574\u958b\u767c\u904e\u7a0b<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">\u9078\u9805 2\uff1aSquash and merge<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-2\" data-shcb-language-name=\"HTTP\" data-shcb-language-slug=\"http\"><span><code class=\"hljs language-http\"><span class=\"hljs-attribute\">main<\/span>:    A---B---S\n\nfeature:       C---D---E  (\u9019\u4e9b\u6703\u88ab\u58d3\u6210\u4e00\u500b S)\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-2\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">HTTP<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">http<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7ffb\u8b6f<\/strong>\uff1a\u628a feature \u5206\u652f\u7684\u6240\u6709 commit \u58d3\u6210\u4e00\u500b\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u9069\u5408\u5834\u666f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>commit \u592a\u591a\u592a\u96dc\u4e82<\/li>\n<li>\u53ea\u60f3\u4fdd\u7559\u300c\u505a\u4e86\u4ec0\u9ebc\u300d\uff0c\u4e0d\u9700\u8981\u300c\u600e\u9ebc\u505a\u7684\u300d<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">\u9078\u9805 3\uff1aRebase and merge<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-3\" data-shcb-language-name=\"HTTP\" data-shcb-language-slug=\"http\"><span><code class=\"hljs language-http\"><span class=\"hljs-attribute\">main<\/span>:    A---B---C'---D'---E'\n\nfeature:       C---D---E  (\u8907\u88fd\u4e00\u4efd\u63a5\u5230 B \u5f8c\u9762)\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-3\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">HTTP<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">http<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7ffb\u8b6f<\/strong>\uff1a\u628a feature \u7684 commit \u8907\u88fd\u4e00\u4efd\uff0c\u63a5\u5728 main \u5f8c\u9762\uff0c\u8b8a\u6210\u76f4\u7dda\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u9069\u5408\u5834\u666f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u60f3\u8981\u4e7e\u6de8\u7684\u76f4\u7dda\u6b77\u53f2<\/li>\n<li>\u9700\u8981\u9032\u968e Git \u77e5\u8b58<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u5e38\u898b\u9078\u64c7\u6307\u5357<\/h2>\n\n\n\n<figure class=\"wp-block-table\"><table>\n<thead>\n<tr>\n<th>\u60c5\u6cc1<\/th>\n<th>\u5efa\u8b70\u9078\u64c7<\/th>\n<th>\u539f\u56e0<\/th>\n<\/tr>\n<\/thead>\n<tbody>\n<tr>\n<td>\u4e0d\u77e5\u9053\u9078\u4ec0\u9ebc<\/td>\n<td>Merge commit<\/td>\n<td>\u6700\u5b89\u5168\uff0c\u4fdd\u7559\u5168\u90e8\u6b77\u53f2<\/td>\n<\/tr>\n<tr>\n<td>\u4fee\u6539\u5f88\u5c0f\uff081-3 commits\uff09<\/td>\n<td>Squash<\/td>\n<td>\u5408\u6210\u4e00\u500b\u66f4\u6e05\u695a<\/td>\n<\/tr>\n<tr>\n<td>commit \u5f88\u4e82\u6709\u5f88\u591a\u300cfix typo\u300d<\/td>\n<td>Squash<\/td>\n<td>\u6e05\u7406\u6389\u96dc\u4e82\u6b77\u53f2<\/td>\n<\/tr>\n<tr>\n<td>\u60f3\u8981\u76f4\u7dda\u6b77\u53f2<\/td>\n<td>Rebase<\/td>\n<td>\u4f46\u8981\u78ba\u5b9a\u6c92\u4eba\u5728\u7528\u9019\u5206\u652f<\/td>\n<\/tr>\n<\/tbody>\n<\/table><\/figure>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u5be6\u969b\u64cd\u4f5c\uff1a\u5408\u4f75 PR<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">\u6b65\u9a5f 1\uff1a\u78ba\u8a8d\u6aa2\u67e5\u90fd\u901a\u904e<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u770b\u5230\u9019\u500b\u756b\u9762\u624d\u80fd\u5408\u4f75\uff1a<\/p>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-4\" data-shcb-language-name=\"JavaScript\" data-shcb-language-slug=\"javascript\"><span><code class=\"hljs language-javascript\">All checks have passed\n<span class=\"hljs-number\">2<\/span> successful checks\n\nReview required\nChanges approved\n<span class=\"hljs-number\">1<\/span> approving review\n\nThis branch has no conflicts <span class=\"hljs-keyword\">with<\/span> the base branch\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-4\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">JavaScript<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">javascript<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<h3 class=\"wp-block-heading\">\u6b65\u9a5f 2\uff1a\u9078\u64c7\u5408\u4f75\u65b9\u5f0f<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u9ede\u7da0\u8272\u6309\u9215\u65c1\u908a\u7684\u4e0b\u62c9\u7bad\u982d\uff0c\u9078\u64c7\u7b56\u7565\uff08\u901a\u5e38\u7528\u9810\u8a2d\u5c31\u597d\uff09\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">\u6b65\u9a5f 3\uff1a\u9ede\u300cMerge pull request\u300d<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-5\" data-shcb-language-name=\"PHP\" data-shcb-language-slug=\"php\"><span><code class=\"hljs language-php\">+----------------------------------+\n| Merge pull request               |\n+----------------------------------+\n| Add a title (optional)           |\n| &#91;Merge pull request <span class=\"hljs-comment\">#42]         |<\/span>\n|                                  |\n| Add a description (optional)     |\n| &#91;                              ] |\n|                                  |\n| &#91;Confirm merge]                  |\n+----------------------------------+\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-5\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">PHP<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">php<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<h3 class=\"wp-block-heading\">\u6b65\u9a5f 4\uff1a\u522a\u9664\u5206\u652f<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5408\u4f75\u5f8c\u6703\u51fa\u73fe\uff1a<\/p>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-6\" data-shcb-language-name=\"CSS\" data-shcb-language-slug=\"css\"><span><code class=\"hljs language-css\"><span class=\"hljs-selector-tag\">Pull<\/span> <span class=\"hljs-selector-tag\">request<\/span> <span class=\"hljs-selector-tag\">successfully<\/span> <span class=\"hljs-selector-tag\">merged<\/span> <span class=\"hljs-selector-tag\">and<\/span> <span class=\"hljs-selector-tag\">closed<\/span>\n\n<span class=\"hljs-selector-attr\">&#91;Delete branch]<\/span>  &lt;<span class=\"hljs-selector-tag\">--<\/span> \u9ede\u9019\u500b\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-6\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">CSS<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">css<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u70ba\u4ec0\u9ebc\u8981\u522a\u9664\uff1f<\/strong><\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u9019\u500b\u5206\u652f\u7684\u5de5\u4f5c\u5df2\u7d93\u5b8c\u6210<\/li>\n<li>\u907f\u514d\u5206\u652f\u8d8a\u7a4d\u8d8a\u591a<\/li>\n<li>main \u5df2\u7d93\u6709\u9019\u4e9b\u7a0b\u5f0f\u78bc\u4e86<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">GitHub Flow \u8207 CI\/CD<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">\u4ec0\u9ebc\u662f CI\/CD<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\"><span><code class=\"hljs\">CI\uff08\u6301\u7e8c\u6574\u5408\uff09           CD\uff08\u6301\u7e8c\u90e8\u7f72\uff09\n    |                        |\n    v                        v\n&#91;\u7a0b\u5f0f\u78bc\u63a8\u9001] --&gt; &#91;\u81ea\u52d5\u6e2c\u8a66] --&gt; &#91;\u81ea\u52d5\u90e8\u7f72]\n<\/code><\/span><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7ffb\u8b6f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>CI<\/strong>\uff1a\u6bcf\u6b21\u63a8\u7a0b\u5f0f\u78bc\uff0c\u81ea\u52d5\u8dd1\u6e2c\u8a66<\/li>\n<li><strong>CD<\/strong>\uff1a\u6e2c\u8a66\u901a\u904e\u5f8c\uff0c\u81ea\u52d5\u90e8\u7f72\u5230\u4f3a\u670d\u5668<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">GitHub Flow + CI\/CD \u6d41\u7a0b<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\"><span><code class=\"hljs\">1. \u958b\u5206\u652f\u6539\u7a0b\u5f0f\u78bc\n        |\n        v\n2. \u63a8\u5230 GitHub\uff0c\u958b PR\n        |\n        v\n3. CI \u81ea\u52d5\u8dd1\u6e2c\u8a66  &lt;-- \u81ea\u52d5\u7684\n        |\n        v\n4. \u5be9\u6838\u901a\u904e\uff0c\u5408\u4f75\u5230 main\n        |\n        v\n5. CD \u81ea\u52d5\u90e8\u7f72\u4e0a\u7dda  &lt;-- \u81ea\u52d5\u7684\n<\/code><\/span><\/pre><\/div>\n\n\n<h3 class=\"wp-block-heading\">\u5728 GitHub \u4e0a\u770b\u8d77\u4f86\u50cf\u9019\u6a23<\/h3>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-7\" data-shcb-language-name=\"PHP\" data-shcb-language-slug=\"php\"><span><code class=\"hljs language-php\">Pull Request <span class=\"hljs-comment\">#42<\/span>\n\nChecks\n+----------------------------------+\n| &#91;x] build (<span class=\"hljs-number\">3<\/span>m <span class=\"hljs-number\">42<\/span>s)               |\n| &#91;x] test (<span class=\"hljs-number\">5<\/span>m <span class=\"hljs-number\">18<\/span>s)                |\n| &#91;x] lint (<span class=\"hljs-number\">1<\/span>m <span class=\"hljs-number\">03<\/span>s)                |\n+----------------------------------+\n\n^^ \u9019\u4e9b\u90fd\u662f CI \u81ea\u52d5\u8dd1\u7684\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-7\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">PHP<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">php<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\">\u5408\u4f75\u5f8c\uff1a<\/p>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\"><span><code class=\"hljs\">GitHub Actions\n\ndeploy (2m 15s) - completed  &lt;-- CD \u81ea\u52d5\u90e8\u7f72\n<\/code><\/span><\/pre><\/div>\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u5e38\u898b\u554f\u984c\uff1a\u5408\u4f75\u885d\u7a81<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">\u4ec0\u9ebc\u6642\u5019\u6703\u767c\u751f<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u4f60\u6539 A \u6a94\u6848\u7684\u7b2c 10 \u884c\uff0c\u540c\u6642\u5225\u4eba\u4e5f\u6539\u4e86\u7b2c 10 \u884c\uff0c\u800c\u4e14\u5148\u5408\u4f75\u4e86\u3002<\/p>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\"><span><code class=\"hljs\">This branch has conflicts that must be resolved\n\nConflicting files:\n- src\/app.py\n<\/code><\/span><\/pre><\/div>\n\n\n<h3 class=\"wp-block-heading\">\u600e\u9ebc\u770b\u61c2\u885d\u7a81\u6a19\u8a18<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">GitHub \u6703\u986f\u793a\uff1a<\/p>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\" aria-describedby=\"shcb-language-8\" data-shcb-language-name=\"JavaScript\" data-shcb-language-slug=\"javascript\"><span><code class=\"hljs language-javascript\">def greeting():\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; feature-branch\n    <span class=\"hljs-keyword\">return<\/span> <span class=\"hljs-string\">\"Hello, World!\"<\/span>\n=======\n    <span class=\"hljs-keyword\">return<\/span> <span class=\"hljs-string\">\"Hi, World!\"<\/span>\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; main\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-8\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">JavaScript<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">javascript<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u7ffb\u8b6f<\/strong>\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; feature-branch<\/code>\uff1a\u4f60\u7684\u7248\u672c\u958b\u59cb<\/li>\n<li><code>=======<\/code>\uff1a\u5206\u9694\u7dda<\/li>\n<li><code>&gt;&gt;&gt;&gt;&gt;&gt;&gt; main<\/code>\uff1amain \u7684\u7248\u672c<\/li>\n<li>\u4f60\u8981\u6c7a\u5b9a\u4fdd\u7559\u54ea\u500b\uff08\u6216\u5408\u4f75\u5169\u500b\uff09<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">\u89e3\u6c7a\u885d\u7a81<\/h3>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u9ede\u300cResolve conflicts\u300d<\/li>\n<li>\u624b\u52d5\u7de8\u8f2f\uff0c\u6c7a\u5b9a\u8981\u4fdd\u7559\u4ec0\u9ebc<\/li>\n<li>\u522a\u6389 <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code>\u3001<code>=======<\/code>\u3001<code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/code> \u6a19\u8a18<\/li>\n<li>\u9ede\u300cMark as resolved\u300d<\/li>\n<li>\u9ede\u300cCommit merge\u300d<\/li>\n<\/ol>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">Vibe Coder \u6aa2\u67e5\u9ede<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u5408\u4f75 PR \u6642\u78ba\u8a8d\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>[ ] CI \u6e2c\u8a66\u90fd\u901a\u904e\u4e86\u55ce\uff1f\uff08\u7da0\u52fe\uff09<\/li>\n<li>[ ] \u6709\u4eba\u5be9\u6838\u4e26\u6279\u51c6\u4e86\u55ce\uff1f<\/li>\n<li>[ ] \u6c92\u6709\u5408\u4f75\u885d\u7a81\u55ce\uff1f<\/li>\n<li>[ ] \u5408\u4f75\u5f8c\u522a\u9664\u5206\u652f\u4e86\u55ce\uff1f<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">\u770b\u5230\u5408\u4f75\u885d\u7a81\u6642\u78ba\u8a8d\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>[ ] \u77e5\u9053 <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code> \u548c <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/code> \u4e4b\u9593\u662f\u4ec0\u9ebc\u55ce\uff1f<\/li>\n<li>[ ] \u6c7a\u5b9a\u597d\u8981\u4fdd\u7559\u54ea\u500b\u7248\u672c\u4e86\u55ce\uff1f<\/li>\n<li>[ ] \u522a\u9664\u885d\u7a81\u6a19\u8a18\u4e86\u55ce\uff1f<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u7cfb\u5217\u56de\u9867\uff1aGitHub Flow \u5b8c\u6574\u6d41\u7a0b<\/h2>\n\n\n<div class=\"cbc-code-wrapper\"><div class=\"cbc-code-bar\"><button class=\"cbc-copy-button\">Copy<\/button><\/div><pre class=\"wp-block-code\"><span><code class=\"hljs\">1. \u5f9e main \u958b\u5206\u652f\n   git checkout -b feature-xxx\n        |\n        v\n2. \u5728\u5206\u652f\u4e0a\u958b\u767c\n   git add . &amp;&amp; git commit\n        |\n        v\n3. \u63a8\u9001\u4e26\u958b PR\n   git push -u origin feature-xxx\n        |\n        v\n4. \u7a0b\u5f0f\u78bc\u5be9\u67e5\n   \u540c\u4e8b\u770b\u7a0b\u5f0f\u78bc\u3001\u7559\u8a55\u8ad6\u3001\u6279\u51c6\n        |\n        v\n5. \u5408\u4f75\u5230 main\uff08\u672c\u7bc7\u91cd\u9ede\uff09\n   \u9ede Merge pull request\n        |\n        v\n6. \u522a\u9664\u5206\u652f\n   \u9ede Delete branch\n        |\n        v\n7. \u81ea\u52d5\u90e8\u7f72\uff08\u5982\u679c\u6709\u8a2d\u5b9a\uff09\n<\/code><\/span><\/pre><\/div>\n\n\n<p class=\"wp-block-paragraph\"><strong>\u606d\u559c\u4f60\u5b78\u5b8c GitHub Flow\uff01<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u9019\u5c31\u662f\u696d\u754c\u6700\u5e38\u7528\u7684\u5354\u4f5c\u6d41\u7a0b\u3002\u91cd\u9ede\u662f\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>main \u6c38\u9060\u4fdd\u6301\u53ef\u90e8\u7f72\u72c0\u614b<\/li>\n<li>\u6240\u6709\u4fee\u6539\u90fd\u900f\u904e PR \u9032\u884c<\/li>\n<li>\u6bcf\u500b PR \u90fd\u8981\u7d93\u904e\u5be9\u6838<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">\u5ef6\u4f38\uff1a\u77e5\u9053\u5c31\u597d<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u9019\u4e9b\u9032\u968e\u529f\u80fd\u9047\u5230\u518d\u67e5\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>Protected branches<\/strong>\uff1a\u4fdd\u8b77 main \u4e0d\u88ab\u76f4\u63a5 push<\/li>\n<li><strong>Required reviewers<\/strong>\uff1a\u5f37\u5236\u8981\u6c42\u7279\u5b9a\u4eba\u5be9\u6838<\/li>\n<li><strong>Status checks<\/strong>\uff1a\u8a2d\u5b9a\u5fc5\u9808\u901a\u904e\u7684 CI \u6aa2\u67e5<\/li>\n<li><strong>Auto-merge<\/strong>\uff1a\u5be9\u6838\u901a\u904e\u5f8c\u81ea\u52d5\u5408\u4f75<\/li>\n<\/ul>\n\n\n\n<div id=\"quiz-advanced\">\n<style>\n#quiz-advanced .badge {\n        display: inline-block;\n        padding: 4px 10px;\n        border-radius: 12px;\n        font-size: 0.75em;\n        font-weight: bold;\n        margin-left: 8px;\n      }#quiz-advanced .badge.scenario {\n        background: #ebf8ff;\n        color: #2b6cb0;\n      }#quiz-advanced .badge.debug {\n        background: #fef3c7;\n        color: #92400e;\n      }#quiz-advanced .question-adv {\n        background: white;\n        border-radius: 10px;\n        padding: 24px;\n        margin: 20px 0;\n        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);\n        border-left: 4px solid #ed8936;\n      }#quiz-advanced .question-adv h3 {\n        margin-top: 0;\n        color: #2d3748;\n      }#quiz-advanced .code-block {\n        background: #1e1e1e;\n        color: #d4d4d4;\n        padding: 14px;\n        border-radius: 6px;\n        font-family: \"Menlo\", \"Monaco\", \"Courier New\", monospace;\n        font-size: 0.9em;\n        overflow-x: auto;\n        margin: 12px 0;\n        white-space: pre-wrap;\n      }#quiz-advanced .options-adv {\n        list-style: none;\n        padding: 0;\n      }#quiz-advanced .options-adv li {\n        padding: 14px 16px;\n        margin: 10px 0;\n        border: 2px solid #e2e8f0;\n        border-radius: 8px;\n        cursor: pointer;\n        transition: all 0.2s;\n      }#quiz-advanced .options-adv li:hover:not(.disabled) {\n        border-color: #ed8936;\n        background: #fffaf0;\n      }#quiz-advanced .options-adv li.disabled {\n        cursor: default;\n        opacity: 0.7;\n      }#quiz-advanced .options-adv li.show-answer {\n        border-color: #48bb78;\n        background: #f0fff4;\n      }#quiz-advanced .options-adv li.wrong {\n        border-color: #fc8181;\n        background: #fff5f5;\n      }#quiz-advanced .feedback-adv {\n        margin-top: 16px;\n        padding: 14px;\n        border-radius: 8px;\n        display: none;\n        line-height: 1.6;\n      }#quiz-advanced .feedback-adv.correct {\n        background: #f0fff4;\n        color: #276749;\n        display: block;\n      }#quiz-advanced .feedback-adv.wrong {\n        background: #fff5f5;\n        color: #c53030;\n        display: block;\n      }#quiz-advanced .feedback-adv \n      .score-adv {\n        text-align: center;\n        font-size: 1.4em;\n        padding: 24px;\n        background: white;\n        border-radius: 10px;\n        margin-top: 24px;\n        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);\n      }#quiz-advanced .intro {\n        background: #ebf8ff;\n        padding: 16px;\n        border-radius: 8px;\n        margin-bottom: 20px;\n        color: #2c5282;\n      }\n<\/style>\n<h1>\u9032\u968e\u6e2c\u9a57\uff1aGitHub Flow &#8211; \u5408\u4f75\u8207\u90e8\u7f72<\/h1>\n    <div class=\"intro\">\n      <strong>\u6e2c\u9a57\u76ee\u6a19\uff1a<\/strong>\u9a57\u8b49\u4f60\u662f\u5426\u80fd\u5728\u5be6\u969b\u60c5\u5883\u4e2d\u61c9\u7528\u6240\u5b78\u3002<br \/>\n      \u5171 5 \u984c\uff0c\u5305\u542b\u60c5\u5883\u984c\u8207\u932f\u8aa4\u8a3a\u65b7\u984c\u3002\n    <\/div>\n\n    <div class=\"question-adv\" id=\"qAdv1\">\n      <h3>1. \u4f60\u7684 PR \u6709 20 \u500b commit\uff0c\u5176\u4e2d\u5f88\u591a\u662f\u300cfix typo\u300d\u3001\u300cupdate\u300d\u9019\u985e\u5c0f\u4fee\u6b63\u3002\u5718\u968a\u5e0c\u671b main \u7684\u6b77\u53f2\u4fdd\u6301\u4e7e\u6de8\uff0c\u4f60\u61c9\u8a72\u9078\u64c7\u54ea\u7a2e\u5408\u4f75\u7b56\u7565\uff1f <span class=\"badge scenario\">\u60c5\u5883\u984c<\/span><\/h3>\n      <ul class=\"options-adv\">\n        <li onclick=\"checkAnswerAdv(1, 'A', 'B')\">A. Create a merge commit &#8211; \u4fdd\u7559\u5b8c\u6574\u6b77\u53f2\u6bd4\u8f03\u597d\u8ffd\u8e64<\/li>\n        <li onclick=\"checkAnswerAdv(1, 'B', 'B')\">B. Squash and merge &#8211; \u628a\u6240\u6709 commit \u58d3\u6210\u4e00\u500b\uff0c\u6e05\u7406\u96dc\u4e82\u6b77\u53f2<\/li>\n        <li onclick=\"checkAnswerAdv(1, 'C', 'B')\">C. Rebase and merge &#8211; \u8b93\u6b77\u53f2\u8b8a\u6210\u76f4\u7dda<\/li>\n        <li onclick=\"checkAnswerAdv(1, 'D', 'B')\">D. \u4e0d\u5408\u4f75\uff0c\u5148\u624b\u52d5\u6574\u7406 commit \u518d\u958b\u65b0 PR<\/li>\n      <\/ul>\n      <div class=\"feedback-adv\" id=\"fbAdv1\"><\/div>\n    <\/div>\n\n    <div class=\"question-adv\" id=\"qAdv2\">\n      <h3>2. \u540c\u4e8b\u5c0f\u7f8e\u60f3\u5408\u4f75\u5979\u7684 PR\uff0c\u4f46 GitHub \u986f\u793a\u4ee5\u4e0b\u8a0a\u606f\u3002\u5979\u61c9\u8a72\u5148\u505a\u4ec0\u9ebc\uff1f <span class=\"badge debug\">\u932f\u8aa4\u8a3a\u65b7<\/span><\/h3>\n      <div class=\"code-block\">This branch has conflicts that must be resolved\n\nConflicting files:\n&#8211; src\/config.js<\/div>\n      <ul class=\"options-adv\">\n        <li onclick=\"checkAnswerAdv(2, 'A', 'C')\">A. \u76f4\u63a5\u9ede Merge pull request\uff0cGitHub \u6703\u81ea\u52d5\u89e3\u6c7a<\/li>\n        <li onclick=\"checkAnswerAdv(2, 'B', 'C')\">B. \u8acb\u540c\u4e8b\u5148\u5be9\u6838\u6279\u51c6<\/li>\n        <li onclick=\"checkAnswerAdv(2, 'C', 'C')\">C. \u9ede Resolve conflicts\uff0c\u624b\u52d5\u7de8\u8f2f\u6c7a\u5b9a\u4fdd\u7559\u54ea\u500b\u7248\u672c<\/li>\n        <li onclick=\"checkAnswerAdv(2, 'D', 'C')\">D. \u522a\u9664\u9019\u500b PR\uff0c\u91cd\u65b0\u5efa\u7acb\u4e00\u500b\u65b0\u7684<\/li>\n      <\/ul>\n      <div class=\"feedback-adv\" id=\"fbAdv2\"><\/div>\n    <\/div>\n\n    <div class=\"question-adv\" id=\"qAdv3\">\n      <h3>3. \u4f60\u7684\u5718\u968a\u525b\u5c0e\u5165 CI\/CD\uff0cPR \u9801\u9762\u986f\u793a\u4ee5\u4e0b\u72c0\u614b\u3002\u9019\u4ee3\u8868\u4ec0\u9ebc\u610f\u601d\uff1f <span class=\"badge scenario\">\u60c5\u5883\u984c<\/span><\/h3>\n      <div class=\"code-block\">Checks\n+&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;-+\n| [x] build (3m 42s)               |\n| [x] test (5m 18s)                |\n| [ ] lint (failed)                |\n+&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;-+<\/div>\n      <ul class=\"options-adv\">\n        <li onclick=\"checkAnswerAdv(3, 'A', 'D')\">A. \u6240\u6709\u6aa2\u67e5\u90fd\u901a\u904e\u4e86\uff0c\u53ef\u4ee5\u5408\u4f75<\/li>\n        <li onclick=\"checkAnswerAdv(3, 'B', 'D')\">B. \u53ea\u6709 lint \u6aa2\u67e5\u5931\u6557\uff0c\u4f46\u4e0d\u5f71\u97ff\u529f\u80fd\uff0c\u53ef\u4ee5\u5408\u4f75<\/li>\n        <li onclick=\"checkAnswerAdv(3, 'C', 'D')\">C. \u9700\u8981\u7b49 lint \u5b8c\u6210\u624d\u80fd\u770b\u7d50\u679c<\/li>\n        <li onclick=\"checkAnswerAdv(3, 'D', 'D')\">D. lint \u6aa2\u67e5\u5931\u6557\u4e86\uff0c\u61c9\u8a72\u5148\u4fee\u6b63\u7a0b\u5f0f\u78bc\u98a8\u683c\u554f\u984c\u518d\u5408\u4f75<\/li>\n      <\/ul>\n      <div class=\"feedback-adv\" id=\"fbAdv3\"><\/div>\n    <\/div>\n\n    <div class=\"question-adv\" id=\"qAdv4\">\n      <h3>4. \u5c0f\u660e\u5728\u89e3\u6c7a\u5408\u4f75\u885d\u7a81\u6642\uff0c\u770b\u5230\u4ee5\u4e0b\u7a0b\u5f0f\u78bc\u3002\u4ed6\u60f3\u8981\u540c\u6642\u4fdd\u7559\u5169\u500b\u529f\u80fd\uff0c\u61c9\u8a72\u600e\u9ebc\u8655\u7406\uff1f <span class=\"badge debug\">\u932f\u8aa4\u8a3a\u65b7<\/span><\/h3>\n      <div class=\"code-block\">def greeting(name):\n<<<<<<< feature-branch\n    return f\"Hello, {name}! Welcome!\"\n=======\n    return f\"Hi, {name}!\"\n>>>>>>> main<\/div>\n      <ul class=\"options-adv\">\n        <li onclick=\"checkAnswerAdv(4, 'A', 'B')\">A. \u4fdd\u7559 <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code> \u5230 <code>=======<\/code> \u4e4b\u9593\u7684\u7a0b\u5f0f\u78bc<\/li>\n        <li onclick=\"checkAnswerAdv(4, 'B', 'B')\">B. \u624b\u52d5\u5408\u4f75\u5169\u500b\u7248\u672c\u7684\u529f\u80fd\uff0c\u4e26\u522a\u9664\u6240\u6709\u885d\u7a81\u6a19\u8a18<\/li>\n        <li onclick=\"checkAnswerAdv(4, 'C', 'B')\">C. \u53ea\u4fdd\u7559 <code>=======<\/code> \u5230 <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/code> \u4e4b\u9593\u7684\u7a0b\u5f0f\u78bc<\/li>\n        <li onclick=\"checkAnswerAdv(4, 'D', 'B')\">D. \u5728 GitHub \u4e0a\u6309 Accept both changes \u6309\u9215<\/li>\n      <\/ul>\n      <div class=\"feedback-adv\" id=\"fbAdv4\"><\/div>\n    <\/div>\n\n    <div class=\"question-adv\" id=\"qAdv5\">\n      <h3>5. \u5718\u968a\u60f3\u8981\u78ba\u4fdd main \u5206\u652f\u6c38\u9060\u4fdd\u6301\u53ef\u90e8\u7f72\u72c0\u614b\uff0c\u4ee5\u4e0b\u54ea\u500b\u505a\u6cd5\u6700\u7b26\u5408 GitHub Flow \u7684\u7cbe\u795e\uff1f <span class=\"badge scenario\">\u60c5\u5883\u984c<\/span><\/h3>\n      <ul class=\"options-adv\">\n        <li onclick=\"checkAnswerAdv(5, 'A', 'C')\">A. \u8b93\u6bcf\u500b\u4eba\u90fd\u80fd\u76f4\u63a5 push \u5230 main\uff0c\u52a0\u5feb\u958b\u767c\u901f\u5ea6<\/li>\n        <li onclick=\"checkAnswerAdv(5, 'B', 'C')\">B. \u6bcf\u9031\u4e94\u7d71\u4e00\u5408\u4f75\u6240\u6709 PR \u5230 main<\/li>\n        <li onclick=\"checkAnswerAdv(5, 'C', 'C')\">C. \u6240\u6709\u4fee\u6539\u90fd\u900f\u904e PR \u9032\u884c\uff0c\u6bcf\u500b PR \u90fd\u8981\u7d93\u904e\u5be9\u6838\u548c CI \u6e2c\u8a66<\/li>\n        <li onclick=\"checkAnswerAdv(5, 'D', 'C')\">D. \u5efa\u7acb\u591a\u500b\u9577\u671f\u5206\u652f\uff0c\u53ea\u5728 release \u6642\u624d\u5408\u4f75\u5230 main<\/li>\n      <\/ul>\n      <div class=\"feedback-adv\" id=\"fbAdv5\"><\/div>\n    <\/div>\n\n    <div class=\"score-adv\" id=\"scoreAdv\" style=\"display:none;\"><\/div>\n<script>\n\n      let answeredAdv = 0;\n      let correctAdv = 0;\n      const totalAdv = 5;\n      const explanationsAdv = {\n        1: \"\u7576 commit \u592a\u591a\u592a\u96dc\u4e82\uff08\u5c24\u5176\u6709\u5f88\u591a\u300cfix typo\u300d\u9019\u985e\u5c0f\u4fee\u6b63\uff09\uff0cSquash and merge \u662f\u6700\u4f73\u9078\u64c7\u3002\u5b83\u6703\u628a\u6240\u6709 commit \u58d3\u6210\u4e00\u500b\uff0c\u53ea\u4fdd\u7559\u300c\u505a\u4e86\u4ec0\u9ebc\u300d\u7684\u7d50\u679c\uff0c\u8b93 main \u7684\u6b77\u53f2\u4fdd\u6301\u4e7e\u6de8\u3002Rebase \u96d6\u7136\u4e5f\u80fd\u7522\u751f\u76f4\u7dda\u6b77\u53f2\uff0c\u4f46\u6703\u4fdd\u7559\u6bcf\u500b commit\uff0c\u4e0d\u6703\u6e05\u7406\u96dc\u4e82\u6b77\u53f2\u3002\",\n        2: \"\u770b\u5230\u300cThis branch has conflicts that must be resolved\u300d\u8868\u793a\u6709\u5408\u4f75\u885d\u7a81\u3002\u5fc5\u9808\u5148\u89e3\u6c7a\u885d\u7a81\u624d\u80fd\u5408\u4f75\u3002\u6b63\u78ba\u505a\u6cd5\u662f\u9ede\u300cResolve conflicts\u300d\uff0c\u624b\u52d5\u7de8\u8f2f\u6c7a\u5b9a\u4fdd\u7559\u54ea\u500b\u7248\u672c\uff0c\u522a\u9664\u885d\u7a81\u6a19\u8a18\u5f8c\uff0c\u9ede\u300cMark as resolved\u300d\u548c\u300cCommit merge\u300d\u3002GitHub \u4e0d\u6703\u81ea\u52d5\u89e3\u6c7a\u5167\u5bb9\u885d\u7a81\u3002\",\n        3: \"CI \u6aa2\u67e5\u4e2d\u6709\u4e00\u9805 lint \u986f\u793a failed\uff0c\u4ee3\u8868\u7a0b\u5f0f\u78bc\u98a8\u683c\u6aa2\u67e5\u6c92\u6709\u901a\u904e\u3002\u5373\u4f7f build \u548c test \u90fd\u904e\u4e86\uff0clint \u5931\u6557\u4e5f\u61c9\u8a72\u4fee\u6b63\u3002\u300cAll checks have passed\u300d\u624d\u8868\u793a\u6240\u6709\u6aa2\u67e5\u90fd\u901a\u904e\u3002\u5728\u6b63\u898f\u7684 CI\/CD \u6d41\u7a0b\u4e2d\uff0c\u4efb\u4f55\u4e00\u9805\u5931\u6557\u90fd\u61c9\u8a72\u5148\u4fee\u6b63\u518d\u5408\u4f75\u3002\",\n        4: \"\u60f3\u8981\u540c\u6642\u4fdd\u7559\u5169\u500b\u7248\u672c\u7684\u529f\u80fd\u6642\uff0c\u9700\u8981\u624b\u52d5\u5408\u4f75\u7a0b\u5f0f\u78bc\u3002\u4f8b\u5982\u53ef\u4ee5\u5beb\u6210 <code>return f\\\"Hello, {name}! Welcome!\\\"<\/code> \u6216\u81ea\u5df1\u8a2d\u8a08\u7d50\u5408\u5169\u8005\u7684\u5beb\u6cd5\u3002\u6700\u91cd\u8981\u7684\u662f\u5fc5\u9808\u522a\u9664 <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code>\u3001<code>=======<\/code>\u3001<code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/code> \u9019\u4e9b\u885d\u7a81\u6a19\u8a18\uff0c\u5426\u5247\u7a0b\u5f0f\u78bc\u6703\u58de\u6389\u3002\",\n        5: \"GitHub Flow \u7684\u6838\u5fc3\u7cbe\u795e\u662f\uff1amain \u6c38\u9060\u4fdd\u6301\u53ef\u90e8\u7f72\u72c0\u614b\u3001\u6240\u6709\u4fee\u6539\u90fd\u900f\u904e PR \u9032\u884c\u3001\u6bcf\u500b PR \u90fd\u8981\u7d93\u904e\u5be9\u6838\u3002\u9019\u78ba\u4fdd\u4e86\u7a0b\u5f0f\u78bc\u54c1\u8cea\u3002\u76f4\u63a5 push \u5230 main \u6703\u7e5e\u904e\u5be9\u6838\u6d41\u7a0b\uff0c\u9031\u4e94\u7d71\u4e00\u5408\u4f75\u6703\u9020\u6210\u98a8\u96aa\u96c6\u4e2d\uff0c\u591a\u500b\u9577\u671f\u5206\u652f\u5247\u662f Git Flow \u7684\u505a\u6cd5\uff0c\u4e0d\u662f GitHub Flow\u3002\"\n      };\n\n      function checkAnswerAdv(qNum, selected, correctAns) {\n        const question = document.getElementById(\"qAdv\" + qNum);\n        if (question.classList.contains(\"answered\")) return;\n\n        question.classList.add(\"answered\");\n        answeredAdv++;\n\n        const options = question.querySelectorAll(\".options-adv li\");\n        options.forEach((opt) => {\n          opt.classList.add(\"disabled\");\n          if (opt.textContent.startsWith(correctAns + \".\")) {\n            opt.classList.add(\"show-answer\");\n          }\n        });\n\n        const feedback = document.getElementById(\"fbAdv\" + qNum);\n        if (selected === correctAns) {\n          correctAdv++;\n          feedback.className = \"feedback-adv correct\";\n          feedback.innerHTML = \"\u2713 \u6b63\u78ba\uff01\" + explanationsAdv[qNum];\n        } else {\n          feedback.className = \"feedback-adv wrong\";\n          feedback.innerHTML =\n            \"\u2717 \u932f\u8aa4\u3002\u6b63\u78ba\u7b54\u6848\u662f \" + correctAns + \"\u3002\" + explanationsAdv[qNum];\n          options.forEach((opt) => {\n            if (opt.textContent.startsWith(selected + \".\")) {\n              opt.classList.add(\"wrong\");\n            }\n          });\n        }\n\n        if (answeredAdv === totalAdv) {\n          const scoreDiv = document.getElementById(\"scoreAdv\");\n          scoreDiv.style.display = \"block\";\n          let msg = \"\";\n          if (correctAdv === totalAdv) msg = \"\ud83c\udfaf \u5b8c\u7f8e\uff01\u4f60\u5df2\u7d93\u6e96\u5099\u597d\u5be6\u6230\u4e86\uff01\";\n          else if (correctAdv >= Math.ceil(totalAdv * 0.8))\n            msg = \"\ud83d\udcaa \u5f88\u68d2\uff01\u518d\u8907\u7fd2\u4e00\u4e0b\u932f\u7684\u984c\u76ee\";\n          else if (correctAdv >= Math.ceil(totalAdv * 0.6))\n            msg = \"\ud83d\udcd6 \u5efa\u8b70\u91cd\u8b80\u76f8\u95dc\u6bb5\u843d\u5f8c\u518d\u8a66\u4e00\u6b21\";\n          else msg = \"\ud83d\udd04 \u5efa\u8b70\u91cd\u65b0\u95b1\u8b80\u6587\u4ef6\uff0c\u7279\u5225\u6ce8\u610f\u64cd\u4f5c\u6d41\u7a0b\";\n          scoreDiv.innerHTML =\n            \"\u6e2c\u9a57\u5b8c\u6210\uff01\u5f97\u5206\uff1a\" + correctAdv + \" \/ \" + totalAdv + \"<br>\" + msg;\n        }\n      }\n    \n<\/script>\n<\/div>\n","protected":false},"excerpt":{"rendered":"<p>\u6e2c\u9a57\uff1aGitHub Flow &#8211; \u5408\u4f75\u8207\u90e8\u7f72 \u5171 5 \u984c\uff0c\u9ede\u9078\u7b54\u6848\u5f8c\u6703\u7acb\u5373\u986f\u793a\u7d50\u679c 1. \u5728 Gi [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"rolpb_likes":0,"footnotes":""},"categories":[320],"tags":[321],"class_list":["post-348","post","type-post","status-publish","format-standard","hentry","category-github-flow","tag-github-flow"],"blocksy_meta":{"styles_descriptor":{"styles":{"desktop":"","tablet":"","mobile":""},"google_fonts":[],"version":7}},"_links":{"self":[{"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/posts\/348","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/comments?post=348"}],"version-history":[{"count":0,"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/posts\/348\/revisions"}],"wp:attachment":[{"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/media?parent=348"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/categories?post=348"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.itsmygo.uk\/wordpress\/wp-json\/wp\/v2\/tags?post=348"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}