{"id":4950,"date":"2026-05-04T21:22:03","date_gmt":"2026-05-04T12:22:03","guid":{"rendered":"http:\/\/batmask.net\/?p=4950"},"modified":"2026-05-04T21:22:04","modified_gmt":"2026-05-04T12:22:04","slug":"git-%ec%95%8c%ec%95%84%eb%b3%b4%ea%b8%b0-6-git-merge-rebase","status":"publish","type":"post","link":"http:\/\/batmask.net\/index.php\/2026\/05\/04\/4950\/","title":{"rendered":"git \uc54c\uc544\ubcf4\uae30 #6 : git merge\/rebase"},"content":{"rendered":"\n<h3 class=\"wp-block-heading\">git merge<\/h3>\n\n\n\n<p>\uc55e\uc5d0\uc11c \ud2b9\uc815 \uae30\ub2a5\uc744 \uac1c\ubc1c\ud558\uac70\ub098 \ud14c\uc2a4\ud2b8 \ud558\uae30\uc704\ud574 branch\ub97c \uc0dd\uc131\ud574\uc11c \uc791\uc5c5\uc744 \ud588\ub2e4\uace0 \uc0dd\uac01\ud574\ubcf4\uc790. \uae30\ub2a5\uc744 \ub2e4 \uad6c\ud604\ud558\uace0\ub098\uba74, \uc774\uac78 main \ube0c\ub79c\uce58\uc5d0 \ubc18\uc601\ud574\uc57c \ub2e4\ub978\uc0ac\ub78c\ub4e4\uc774 \uc0ac\uc6a9\ud558\uac70\ub098 \ub9b4\ub9ac\uc988\uc2dc\uc5d0 \ubc18\uc601\uc774 \ub420 \uac83\uc774\ub2e4. \ub610\ub294, \ubcc4\ub3c4\uc758 \ubc84\uc804\uc73c\ub85c \uad00\ub9ac\ud55c\ub2e4\uace0 \ud574\ub3c4 main \ube0c\ub79c\uce58\uc5d0\uc11c \uc9c4\ud589\ub41c \uc791\uc5c5 \ub0b4\uc6a9\uc744 \uc774 \ube0c\ub79c\uce58\uc5d0 \uc801\uc6a9\ud558\uace0 \uc2f6\uc744 \uac83\uc774\ub2e4. \uc774\ub807\uac8c \ud558\ub098\uc758 branch\uc758 \ubcc0\uacbd\uc0ac\ud56d\ub4e4\uc744 \ub2e4\ub978 branch\uc5d0 \ubcd1\ud569\uc2dc\ud0a4\uace0 \uc2f6\uc744 \ub54c \uc0ac\uc6a9\ud558\ub294\uac8c git merge\uc774\ub2e4.<\/p>\n\n\n\n<p>git merge\ub294 \ud504\ub85c\uadf8\ub7a8\uc758 \uaddc\ubaa8\uac00 \ud074\uc218\ub85d, \ubcc0\uacbd\uc0ac\ud56d\uc774 \ub9ce\uc744 \uc218\ub85d \ub2e8\uc21c\ud558\uc9c0 \uc54a\ub2e4. \uc774\ub7f0\uacbd\uc6b0, \ubcc4\ub3c4\ub85c \uac1c\ubc1c\uc774 \uc9c4\ud589\ub41c \ub450 \ube0c\ub79c\uce58\uc758 \uc218\ub9ce\uc740 \uc218\uc815\uc0ac\ud56d\ub4e4\uc774 \uc11c\ub85c \ucda9\ub3cc(conflict)\uc744 \uc77c\uc73c\ud0ac \uac83\uc774\ub2e4. \uadf8\ub798\uc11c git merge\uc758 \ud575\uc2ec\uc740 \uc774 \ucda9\ub3cc\ub4e4\uc744 \ud574\uacb0\ud558\ub294\ub370\uc5d0 \uc788\ub2e4.<\/p>\n\n\n\n<p>git merge\uc758 \uc218\ud589\uc740 \ud604\uc7ac \ube0c\ub79c\uce58\uc5d0\uc11c \ub2e4\ub978 \ubcd1\ud569\ud560 \ube0c\ub79c\uce58\ub97c \uac00\uc838\uc640 \ubcd1\ud569\uc774 \uc774\ub8e8\uc5b4\uc9c4\ub2e4. \uae30\ubcf8\uc801\uc778 git merge \uba85\ub839\uc5b4\uc758 \uc0ac\uc6a9\ubc95\uc740 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git merge &lt;another branch to merge in><\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F69D50\">git<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F47067\">&lt;<\/span><span style=\"color: #96D0FF\">another<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">i<\/span><span style=\"color: #ADBAC7\">n<\/span><span style=\"color: #F47067\">&gt;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ub9cc\uc57d, main branch\uc5d0 new_feature branch\ub97c \ud569\uce58\uace0 \uc2f6\ub2e4\uba74, \ub2e4\uc74c\uacfc \uac19\uc774 \ud55c\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git switch main\ngit merge new_feature<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F69D50\">git<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">switch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">git<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">new_feature<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ud604\uc7ac \ube0c\ub79c\uce58\uac00 main\uc774\ub77c\uba74 \uad73\uc774 switch\uac00 \ud544\uc694\ud558\uc9c4 \uc54a\ub2e4. main \ube0c\ub79c\uce58 \uc0c1\ud0dc\uc5d0\uc11c git merge \uba85\ub839\uc73c\ub85c \ubcd1\ud569\ud560 \ub2e4\ub978 \ube0c\ub79c\uce58 \uc774\ub984\uc744 \uc801\uc73c\uba74 \ub41c\ub2e4. \ub9cc\uc57d\uc5d0 conflict\uac00 \uc0dd\uae30\uc9c0 \uc54a\ub294\ub2e4\uba74, \uc790\ub3d9\uc73c\ub85c fast-forward \ubcd1\ud569\uc774 \uc9c4\ud589\ub418\uc5b4 \ub531\ud788 \ucd94\uac00\uc801\uc778 \uc77c\uc774 \uc5c6\ub2e4. \ud558\uc9c0\ub9cc conflict\uac00 \ubc1c\uc0dd\ud55c\ub2e4\uba74 \uc544\ub798\uc640 \uac19\uc774 \uc5d0\ub7ec\uac00 \ub72c\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main !1>  git merge new_feature\nAuto-merging sayings.py\nCONFLICT (content): Merge conflict in sayings.py\nAutomatic merge failed; fix conflicts and then commit the result.<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main <\/span><span style=\"color: #F47067\">!1&gt;<\/span><span style=\"color: #ADBAC7\">  git merge new_feature<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Auto-merging<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">sayings.py<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">CONFLICT<\/span><span style=\"color: #ADBAC7\"> (content): Merge conflict <\/span><span style=\"color: #F47067\">in<\/span><span style=\"color: #ADBAC7\"> sayings.py<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Automatic<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">failed<\/span><span style=\"color: #ADBAC7\">; <\/span><span style=\"color: #F69D50\">fix<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conflicts<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">then<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">the<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">result.<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\uaf2d \uc54c\uc544\ub46c\uc57c \ud560 \uac83\uc740 merge\ub294 \uc218\ub9ce\uc740 \ucda9\ub3cc\uc774 \ubc1c\uc0dd\ud560 \uc218 \uc788\uace0, \uc774\uac83\ub4e4\uc744 \ud558\ub098\uc529 \ud574\uacb0\ud574 \ub098\uac00\ub824\uba74 \uc2a4\uc704\uce58\ucc98\ub7fc \ub538\uae4d \uc791\ub3d9\uc774 \ub418\uc9c0 \uc54a\ub294\ub2e4. \uadf8\ub807\uae30 \ub54c\ubb38\uc5d0 merge\uac00 \uc9c4\ud589\ub418\ub2e4\uac00 \uc911\uac04\uc5d0 conflict\ub4f1\uc774 \ubc1c\uc0dd\ud558\uba74, merge\uac00 \uc9c4\ud589\uc911\uc778 &#8220;\uc0c1\ud0dc&#8221;\ub85c \uc720\uc9c0\ub41c\ub2e4. \ubcf5\uc7a1\ud55c \ud504\ub85c\uc138\uc2a4\uc774\uae30 \ub54c\ubb38\uc5d0 \ubaa8\ub4e0\uac8c \uc815\ub9ac\ub420 \ub54c\uae4c\uc9c0 \uc0c1\ud0dc\uac00 \uc720\uc9c0\ub418\ub294 \uac83\uc774\ub2e4. git status\ub97c \ubcf4\uba74,<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(2 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main merge ~1 !1>  git status\nOn branch main\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")\n  (use \"git merge --abort\" to abort the merge)\n\nUnmerged paths:\n  (use \"git add &lt;file>...\" to mark resolution)\n\tboth modified:   sayings.py\n\nChanges not staged for commit:\n  (use \"git add &lt;file>...\" to update what will be committed)\n  (use \"git restore &lt;file>...\" to discard changes in working directory)\n\tmodified:   readme.txt\n\nno changes added to commit (use \"git add\" and\/or \"git commit -a\")\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main merge <\/span><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">1 <\/span><span style=\"color: #F47067\">!1&gt;<\/span><span style=\"color: #ADBAC7\">  git status<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">On<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">You<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">have<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">unmerged<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">paths.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">  (<\/span><span style=\"color: #F69D50\">fix<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conflicts<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">run<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git commit&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">  (<\/span><span style=\"color: #F69D50\">use<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git merge --abort&quot;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">abort<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">the<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Unmerged<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">paths:<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">  (<\/span><span style=\"color: #F69D50\">use<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git add &lt;file&gt;...&quot;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">mark<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">resolution<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">\t<\/span><span style=\"color: #F69D50\">both<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">modified:<\/span><span style=\"color: #ADBAC7\">   <\/span><span style=\"color: #96D0FF\">sayings.py<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Changes<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">not<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">staged<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">for<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit:<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">  (<\/span><span style=\"color: #F69D50\">use<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git add &lt;file&gt;...&quot;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">update<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">what<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">will<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">be<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">committed<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">  (<\/span><span style=\"color: #F69D50\">use<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git restore &lt;file&gt;...&quot;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">discard<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changes<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">in<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">working<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">directory<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">\t<\/span><span style=\"color: #F69D50\">modified:<\/span><span style=\"color: #ADBAC7\">   <\/span><span style=\"color: #96D0FF\">readme.txt<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">no<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changes<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">added<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit<\/span><span style=\"color: #ADBAC7\"> (use <\/span><span style=\"color: #96D0FF\">&quot;git add&quot;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and\/or<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git commit -a&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ub0b4\uc6a9\uc5d0 Unmerged paths \uac00 \ubcf4\uc77c \uac83\uc774\ub2e4. \uadf8\ub9ac\uace0 &#8220;fix conflicts and run &#8216;git commit&#8217; &#8220;\ubb38\uad6c\uac00 \ubcf4\uc774\ub294\ub370, \ub2e4 \uace0\uce58\uace0 commit\uc744 \ud574\uc57c \ub05d\ub09c\ub2e4\ub294 \uc598\uae30\uc774\ub2e4. \ub610\ud55c, mark resolution, \uc989, conflict\uac00 \ud574\uacb0\ub410\uc74c\uc744 \ud45c\uc2dc\ud558\ub824\uba74 git add\ub97c \uc368\uc11c stage\uc5d0 \uc62c\ub9ac\ub77c\ub294 \ubb38\uad6c\uac00 \ubcf4\uc778\ub2e4. \uc790\ub3d9\uc73c\ub85c \ubcd1\ud569\ub418\uc9c0 \ubabb\ud588\uc73c\ubbc0\ub85c \uc0ac\uc6a9\uc790\uac00 \uc9c1\uc811 \ucc98\ub9ac\ud558\uace0 add\ub97c \ud558\uba74, \ud574\uacb0\ub41c \uac83\uc73c\ub85c \uac04\uc8fc\ud558\uaca0\ub2e4\ub294 \uc598\uae30\uc774\ub2e4. \uc989, \uc0ac\uc6a9\uc790\uac00 \uc5b4\ub5bb\uac8c \uace0\uce58\ub4e0 \uace0\uccd0\uc11c git add\ub85c staging\ud558\uace0, git commit\uc744 \ud558\uba74 merge\uac00 \uc644\ub8cc\ub418\ub294 \uac83\uc774\ub2e4. <\/p>\n\n\n\n<p>conflict\uac00 \ubc1c\uc0dd\ud55c sayings.py \ud30c\uc77c \ub0b4\uc6a9\uc744 \uc0b4\ud3b4\ubcf4\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Python<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>...\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\ndef call(name):\n    print(f\"Hey! {name}\")\n=======\ndef shout(name):\n    print(f\"{name.upper()}!!!\")\n>>>>>>> new_feature\n...<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">HEAD<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">call<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;Hey! <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">=======<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">shout<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name.upper()<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">!!!&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/span><span style=\"color: #ADBAC7\"> new_feature<\/span><\/span>\n<span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\uc704\uc640\uac19\uc774 git\uc5d0\uc11c conflict\uac00 \uc0dd\uae34 \uc9c0\uc810\uc744 \ud30c\uc77c\uc5d0 \ud45c\uc2dc\ud574\uc900\ub2e4. \ud45c\uc2dc\ub41c\ub300\ub85c \uc704\ucabd\uc774 HEAD, \ud604\uc7ac \ube0c\ub79c\uce58\uc778 main \uc774\uace0 \uc544\ub798\ucabd\uc774 \ubcd1\ud569\ud560 new_feature\uc758 \ub0b4\uc6a9\uc774\ub2e4. \uc0ac\uc6a9\uc790\uac00 \ub0b4\uc6a9\uc744 \uc54c\uc544\uc11c \ud569\uce58\uace0\ub098\uc11c \uad6c\ubd84\uc790 \ub77c\uc778\uc778 &lt;&lt;&lt;&lt;&lt;&lt;&lt; , ======, >>>>>>> \ubd80\ubd84\ub4e4\uc744 \uc81c\uac70\ud574\uc8fc\uba74\ub41c\ub2e4. \uac01 \ud30c\uc77c\uc744 \uace0\uce58\ub294 \uc77c\uc740 \uc774\ub807\uac8c \uc9c1\uc811 \ud14d\uc2a4\ud2b8\ub97c \uc218\uc815\ud574\ub3c4 \ub418\uc9c0\ub9cc, \uac01\uc885 GUI merge tool\ub4e4\uc744 \uc4f8 \uc218\ub3c4 \uc788\uace0 \uadf8\uac8c \uac04\ud3b8\ud560 \uac83\uc774\ub2e4. \uc5ec\uae30\uc11c\ub294 \ud14d\uc2a4\ud2b8 \uc218\uc815\ub9cc \ub2e4\ub8e8\uaca0\ub2e4. <\/p>\n\n\n\n<p>\uc774\uc81c \ub2e4\uc74c\uacfc \uac19\uc774 \uc218\uc815\ud558\uc790. <\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Python<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>def shout(name):\n    print(f\"{name.upper()}!!!\")\n\ndef call(name):\n    print(f\"Hey! {name}\")<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">shout<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name.upper()<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">!!!&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">call<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;Hey! <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ud55c\ucabd\uc758 \uc218\uc815\uc0ac\ud56d\uc744 \ud0dd\ud560 \uc218 \uc788\uc9c0\ub9cc, \uc5ec\uae30\uc11c\ub294 \uc591\ucabd\uc758 \uc218\uc815\uc0ac\ud56d\uc744 \ub458 \ub2e4 \ubc18\uc601\ud588\ub2e4. <\/p>\n\n\n\n<p>\ub2e4\uc74c\uc5d0 git add . \ub85c conflict\uac00 \ubc1c\uc0dd\ud55c \ud30c\uc77c\uacfc fast-forward \ub85c \uc790\ub3d9 \ubcd1\ud569\ub41c \ud30c\uc77c\uae4c\uc9c0 \uc218\uc815\ub41c \ud30c\uc77c\uc744 \uc804\ubd80 \ucd94\uac00\ud574\uc900\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(2 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main> merge +1 !1>  git add .\n~\/g\/myproject \u2502 main> merge +2>  git status  \nOn branch main\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   readme.txt\n\tmodified:   sayings.py\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\"> merge +1 <\/span><span style=\"color: #F47067\">!1&gt;<\/span><span style=\"color: #ADBAC7\">  git add <\/span><span style=\"color: #6CB6FF\">.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\"> merge +<\/span><span style=\"color: #F47067\">2&gt;<\/span><span style=\"color: #ADBAC7\">  git status  <\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">On<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">All<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conflicts<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">fixed<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">but<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">you<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">are<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">still<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merging.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">  (<\/span><span style=\"color: #F69D50\">use<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git commit&quot;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conclude<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Changes<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">be<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">committed:<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">\t<\/span><span style=\"color: #F69D50\">modified:<\/span><span style=\"color: #ADBAC7\">   <\/span><span style=\"color: #96D0FF\">readme.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">\t<\/span><span style=\"color: #F69D50\">modified:<\/span><span style=\"color: #ADBAC7\">   <\/span><span style=\"color: #96D0FF\">sayings.py<\/span><\/span>\n<span class=\"line\"><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\uadf8\ub7ec\uba74 \uc704\uc640\uac19\uc774 \uc790\ub3d9\uc73c\ub85c conflict\uac00 \uace0\uccd0\uc84c\ub2e4\uace0 \ub098\uc624\uba70, \uc544\uc9c1 merging \uc0c1\ud0dc\uc774\ub2c8 commit\uc744 \ud558\ub77c\uace0 \ub72c\ub2e4. \ub9c8\uc9c0\ub9c9\uc73c\ub85c commit\uc744 \ud574\uc8fc\uba74 merge \uc791\uc5c5\uc774 \uc644\ub8cc\ub41c\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main> merge +2>  git commit -m \"new-feature is merged to main\"\n&#91;main fac78e4&#93; new-feature is merged to main<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\"> merge +<\/span><span style=\"color: #F47067\">2&gt;<\/span><span style=\"color: #ADBAC7\">  git commit -m <\/span><span style=\"color: #96D0FF\">&quot;new-feature is merged to main&quot;<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">&#91;main fac78e4&#93; new-feature is merged to main<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>git log\ub97c \uadf8\ub798\ud504\ub85c \uc0b4\ud3b4\ubcf4\uc790.<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"796\" height=\"254\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch06.png\" alt=\"\" class=\"wp-image-4886\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch06.png 796w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch06-300x96.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch06-768x245.png 768w\" sizes=\"auto, (max-width: 796px) 100vw, 796px\" \/><\/figure>\n<\/div>\n\n\n<p>\uadf8\ub798\ud504 \uc774\ubbf8\uc9c0\ub97c \ubcf4\uba74, main branch\uc640 new_feature branch\ub97c \ud569\uccd0\uc11c \uc0c8\ub85c\uc6b4 commit\uc774 \uc0dd\uc131\ub41c\uac78 \ud655\uc778 \ud560 \uc218 \uc788\ub2e4. <\/p>\n\n\n\n<p>\ud14c\uc2a4\ud2b8\ub97c \uc880 \ub354 \ud574\ubcf4\uc790. main branch\uc5d0\uc11c readme.txt\uc5d0 \uc218\uc815\uc0ac\ud56d\uc744 \ub9cc\ub4e4\uc5c8\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(2 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">main\/readme.txt<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>main changed\n\nthis is the first file.\nfile name is 01.txt\nI'm studying git.\nWhy am I so idiot?\n\nLet's dance on stage!\n\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #adbac7\">main changed<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\"><\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">this is the first file.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">file name is 01.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">I&#39;m studying git.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">Why am I so idiot?<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\"><\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">Let&#39;s dance on stage!<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\"><\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\"><\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ud30c\uc77c\uc758 \uc81c\uc77c \uc55e\uc5d0 main changed\ub77c\ub294 \ubb38\uad6c\ub97c \ub123\uc5c8\ub2e4. \ub2e4\uc74c\uc5d0 new_feature\ub85c \ube0c\ub79c\uce58\ub97c \ubcc0\uacbd\ud558\uc5ec readme.txt\uc758 \ub9c8\uc9c0\ub9c9\uc904\uc5d0 \ub2e4\uc74c\uacfc \uac19\uc774 \ucd94\uac00\ud588\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main>  git switch new_feature\nSwitched to branch 'new_feature'<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch new_feature<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;new_feature&#39;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">new_feature\/readme.txt<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>this is the first file.\nfile name is 01.txt\nI'm studying git.\nWhy am I so idiot?\n\nnew_feature has changed\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #adbac7\">this is the first file.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">file name is 01.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">I&#39;m studying git.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">Why am I so idiot?<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\"><\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\">new_feature has changed<\/span><\/span>\n<span class=\"line\"><span style=\"color: #adbac7\"><\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\uc774\uc81c \ub2e4\uc2dc main\uc73c\ub85c \ub3cc\uc544\uac00\uc11c \ubcd1\ud569\ud574\ubcf4\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main>  git merge new_feature\nAuto-merging readme.txt\nCONFLICT (content): Merge conflict in readme.txt\nAutomatic merge failed; fix conflicts and then commit the result.\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git merge new_feature<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Auto-merging<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">readme.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">CONFLICT<\/span><span style=\"color: #ADBAC7\"> (content): Merge conflict <\/span><span style=\"color: #F47067\">in<\/span><span style=\"color: #ADBAC7\"> readme.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Automatic<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">failed<\/span><span style=\"color: #ADBAC7\">; <\/span><span style=\"color: #F69D50\">fix<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conflicts<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">then<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">the<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">result.<\/span><\/span>\n<span class=\"line\"><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\uc557, \uc774\ub7f0. \ub610\ub2e4\uc2dc conflict\uac00 \ubc1c\uc0dd\ud588\ub2e4. \uc774\uac74 \uc758\ub3c4\ud558\uc9c0 \uc54a\uc740\uac74\ub370, main\uc5d0\uc11c \uc218\uc815\ud588\ub358 \ub0b4\uc6a9\uc744 \ub0b4\uac00 \uae4c\uba39\uace0 \uc788\uc5c8\ub2e4. \ub2e8\uc21c\ud55c conflict \ud574\uacb0\uc740 \uc55e\uc5d0\uc11c \ud588\uc73c\ubbc0\ub85c \uc870\uae08 \ub2e4\ub974\uac8c \uc811\uadfc\ud574\ubcf4\uc790. \uc6b0\uc120, \uc774\ub807\uac8c \uc758\ub3c4\ud558\uc9c0 \uc54a\uc740 conflict\uac00 \ubc1c\uc0dd\ud588\uc744 \ub54c, \ubcd1\ud569\uc744 \uc5b4\ub5bb\uac8c \ud560\uc9c0 \ub2f9\ud669\uc2a4\ub7ec\uc6cc\uc11c \uc77c\ub2e8, \uc6d0\ub798\ub300\ub85c \ub418\ub3cc\ub9ac\uace0 \uc2f6\uc744 \ub54c\uac00 \uc788\uc744 \uac83\uc774\ub2e4. \uc774\ub7f4 \ub54c\ub294 &#8220;&#8211;abort&#8221; \uc635\uc158\uc744 \uc368\uc11c \ub418\ub3cc\ub9b4 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git merge --abort<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F69D50\">git<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">--abort<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main merge ~1>  git merge --abort  \n\n~\/g\/myproject \u2502 main>  git status\nOn branch main\nnothing to commit, working tree clean<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main merge <\/span><span style=\"color: #F47067\">~1&gt;<\/span><span style=\"color: #ADBAC7\">  git merge --abort  <\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git status<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">On<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">nothing<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">working<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">tree<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">clean<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>git status\ub85c merge \uc0c1\ud0dc\uac00 \ud480\ub838\uc74c\uc744 \ud655\uc778 \ud560 \uc218 \uc788\ub2e4. <\/p>\n\n\n\n<p> \ub2e4\uc74c\uc5d0 \ud560 \uc791\uc5c5\uc740 main\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 new_feature \ube0c\ub79c\uce58\uc5d0 \ubcd1\ud569\ud558\ub294 \uac83\uc774\ub2e4. \uc2e4\ubb34\uc5d0\uc11c \uc791\uc5c5\uc744 \ud55c\ub2e4\uace0 \uac00\uc815\ud588\uc744 \ub54c, main\uacfc new_feature\uc758 \ube0c\ub79c\uce58\uac00 \ubcc0\uacbd\uc0ac\ud56d\uc774 \ub298\uc5b4\ub0a0\uc218\ub85d \ub098\uc911\uc5d0 \ubcd1\ud569\uc774 \ubcf5\uc7a1\ud574\uc9c8 \uac83\uc774\ub2e4. \uadf8\ub807\ub2e4\uace0 \uae30\ub2a5\uad6c\ud604\uc774 \uc644\ub8cc\ub418\uc9c0 \uc54a\uc740\uac78 main\uc5d0 \ubcd1\ud569\ud560 \uc218\ub294 \uc5c6\ub2e4. \uc774\ub7f4 \ub54c, \uc8fc\uae30\uc801\uc73c\ub85c main\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 new_feature\uc5d0 \ubc18\uc601\ud574\uc8fc\uba74 main\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ub530\ub77c\uc7a1\uc544\uac00\uba70 \uae30\ub2a5 \uad6c\ud604\uc774 \uac00\ub2a5\ud558\uace0, \ub098\uc911\uc5d0 main\uc5d0 \ubc18\uc601\uc2dc\uc5d0\ub3c4 \ucd94\uac00\ud55c \uae30\ub2a5 \ubd80\ubd84\ub9cc \ud070 \uc5b4\ub824\uc6c0\uc5c6\uc774 \ubcd1\ud569\uc774 \uac00\ub2a5\ud574\uc9c4\ub2e4.<\/p>\n\n\n\n<p> new_feature\ub85c \ube0c\ub79c\uce58\ub97c \ubcc0\uacbd\ud558\uc5ec \uc5ec\uae30\uc5d0 main\uc744 \ubcd1\ud569\ud574\ubcf4\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main>  git switch new_feature\nSwitched to branch 'new_feature'\n\n~\/g\/myproject \u2502 new_feature>  git merge main\nAuto-merging readme.txt\nCONFLICT (content): Merge conflict in readme.txt\nAutomatic merge failed; fix conflicts and then commit the result.<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch new_feature<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;new_feature&#39;<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 new_feature<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git merge main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Auto-merging<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">readme.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">CONFLICT<\/span><span style=\"color: #ADBAC7\"> (content): Merge conflict <\/span><span style=\"color: #F47067\">in<\/span><span style=\"color: #ADBAC7\"> readme.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Automatic<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">merge<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">failed<\/span><span style=\"color: #ADBAC7\">; <\/span><span style=\"color: #F69D50\">fix<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conflicts<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">then<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">the<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">result.<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ub2f9\uc5f0\ud788, \uc55e\uc5d0\uc11c\uc640 \uac19\uc774 \ucda9\ub3cc\uc774 \uc0dd\uae34\ub2e4. \uc774\uc804\uc5d0 \uc124\uba85\ud55c\ub300\ub85c conflict\ub97c \ud574\uacb0\ud558\uc790.(\uc5ec\uae30\uc120 \uc0dd\ub7b5) <\/p>\n\n\n\n<p>main \ube0c\ub79c\uce58\ub85c \ub2e4\uc2dc \ubcc0\uacbd\ud55c \ud6c4,<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 new_feature>  git switch main\nSwitched to branch 'main'<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 new_feature<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;main&#39;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>merge\uac00 \uc644\ub8cc\ub41c\uac78 \uadf8\ub798\ud504\ub85c \ubcf4\uba74 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"790\" height=\"327\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch08.png\" alt=\"\" class=\"wp-image-4899\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch08.png 790w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch08-300x124.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch08-768x318.png 768w\" sizes=\"auto, (max-width: 790px) 100vw, 790px\" \/><\/figure>\n<\/div>\n\n\n<p>\uadf8\ub798\ud504\ub97c \ubcf4\uba74, main\uc774 new_feature\ub85c \ubcd1\ud569\ub418\uba74\uc11c new_feature \ube0c\ub79c\uce58\uc5d0 \uc0c8\ub85c\uc6b4 commit\uc774 \uc0dd\uc131\ub41c\uac78 \ubcfc \uc218 \uc788\ub2e4. \uadf8\ub798\ud504\uac00 \uc870\uae08 \ud63c\ub780\uc2a4\ub7ec\uc6b4\uac74, main\uc774 \ub9c8\uce58 new_feature\uc5d0\uc11c \ube0c\ub79c\uce58\ub97c \ub534 \uac83\uac19\uc740 \ud615\ud0dc\ub85c \uc55e\uc5d0\uc11c\uc640\ub294 \ub2ec\ub9ac \ub4a4\uc9d1\ud600\uc788\ub2e4. main\uc744 new_feature\ub85c merge\ub97c \ud574\uc11c \uadf8\ub7f0\uac74\uc9c0, new_feature\uac00 \uac00\uc7a5 \ucd5c\uc2e0\uc758 commit\uc744 \uac00\uc838\uc11c \uadf8\ub7f0\uc9c0 \ubaa8\ub974\uaca0\uc9c0\ub9cc, \ud45c\ud604 \ubc29\uc2dd\uc774 \uc870\uae08 \uc544\uc26c\uc6b4 \ubd80\ubd84\uc774\ub2e4. \ud604\uc7ac \ube0c\ub79c\uce58\ub294 main\uc73c\ub85c \ubcc0\uacbd\ud588\uc73c\ubbc0\ub85c, HEAD\uc758 \uc704\uce58\ub294 main\uc5d0 \ud45c\uc2dc\ub418\uc5b4 \uc788\ub294\uac78 \ubcfc \uc218 \uc788\ub2e4. <\/p>\n\n\n\n<p>\uc774\uc81c \ub2e4\uc2dc new_feature\ub97c main\uc5d0 \ubcd1\ud569\ud574\ubcf4\uc790. new_feature\ub294 \uc774\ubbf8 \ub450 \ube0c\ub79c\uce58\uac00 \ubcd1\ud569\ub41c \uc0c1\ud0dc\uc778\ub370, main\uc5d0\ub294 \ubc18\uc601\ub418\uc9c0 \uc54a\uc558\uc73c\ubbc0\ub85c \uc608\uc0c1\ucee8\ub370, \ucda9\ub3cc\uc5c6\uc774 fast-forward \ubcd1\ud569\uc774 \uc9c4\ud589\ub420 \uac83\uc774\ub2e4. \uc5ec\uae30\uc11c fast-forward\uc758 \uc758\ubbf8\ub97c \ud655\uc2e4\ud788 \uc54c \uc218 \uc788\ub2e4. \uc774\ubbf8 \ubcd1\ud569\ub41c commit\uc774 \uc874\uc7ac\ud558\ubbc0\ub85c \uc6b0\ub9ac\ub294 \uadf8\uc800 main \ube0c\ub79c\uce58\uc758 \ud3ec\uc778\ud130\ub9cc &#8220;\uc55e\uc73c\ub85c \uc9c4\ud589&#8221;\uc2dc\ud0a4\uba74 \ub418\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main>  git merge new_feature\nUpdating 78f1da3..a83283b\nFast-forward\n readme.txt | 1 +\n 1 file changed, 1 insertion(+)<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git merge new_feature<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Updating<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">78<\/span><span style=\"color: #96D0FF\">f1da3..a83283b<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Fast-forward<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">readme.txt<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F47067\">|<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">+<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">file<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changed,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">insertion<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F69D50\">+<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\uc608\uc0c1\ub300\ub85c Fast-forward \uac00 \uc9c4\ud589\ub410\uc73c\uba70 readme.txt\uac00 \ubcc0\uacbd\ub418\uc5c8\ub2e4\uace0 \ud45c\uc2dc\ub41c\ub2e4. git log \uadf8\ub798\ud504\ub97c \uc0b4\ud3b4\ubcf4\uba74,<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"785\" height=\"327\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch09.png\" alt=\"\" class=\"wp-image-4904\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch09.png 785w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch09-300x125.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch09-768x320.png 768w\" sizes=\"auto, (max-width: 785px) 100vw, 785px\" \/><\/figure>\n<\/div>\n\n\n<p>\uc0c8\ub85c\uc6b4 commit\uc774 \uc0dd\uc131\ub418\uc9c0 \uc54a\uace0 new_feature\uc5d0 \ubcd1\ud569\ud558\uba70 \ub9cc\ub4e4\uc5b4\uc9c4 commit\uc73c\ub85c main\uc774 \uc774\ub3d9\ub9cc \ud588\ub2e4. <\/p>\n\n\n\n<h3 class=\"wp-block-heading\">git rebase<\/h3>\n\n\n\n<p>git rebase\ub3c4 merge \ubc29\ubc95\uc911 \ud558\ub098\uc774\ub2e4. base\ub77c\ub294\uac74 branch\uc758 \uc2dc\uc791\uc810\uc744 \uc758\ubbf8\ud55c\ub2e4. \ub2e4\ub974\uac8c\ub9d0\ud574 rebase\ub294 branch\uc758 \uc2dc\uc791\uc810\uc744 \uc0c8\ub85c \uc7a1\ub294\ub2e4\ub294 \uc758\ubbf8\uc774\uae30\ub3c4 \ud558\ub2e4. \uc774\uac74 graph\ub97c \uadf8\ub824\ubcf4\ub294\uac8c \uac00\uc7a5 \uc774\ud574\uac00 \uc27d\ub2e4.<\/p>\n\n\n\n<p>\uc55e\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub358 \uc608\uc81c\ub97c \uacc4\uc18d \uc774\uc5b4\uc11c \uc0ac\uc6a9\ud574\ubcf4\uc790. \uba3c\uc800, \uc0c8 \uae30\ub2a5\uc744 \uad6c\ud604\ud55c\ub2e4\uace0 \uac00\uc815\ud558\uace0 animal \uc774\ub77c\ub294 \ube0c\ub79c\uce58\ub97c \ub9cc\ub4e4\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main>  git switch -c animal\nSwitched to a new branch 'animal'<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch -c animal<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">a<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">new<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;animal&#39;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"127\" height=\"140\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase01.png\" alt=\"\" class=\"wp-image-5318\"\/><\/figure>\n<\/div>\n\n\n<p>\uc774 \ube0c\ub79c\uce58\uc5d0\uc11c sayings.py\ub97c \ud3b8\uc9d1\ud558\uc5ec \ub2e4\uc74c\uc744 \ucd94\uac00\ud558\uace0 commit \ud558\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">animal\/sayings.py<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>...\ndef bark():\n    print(f\"bow wow\")\n...<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">bark<\/span><span style=\"color: #ADBAC7\">():<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;bow wow&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 animal !1>  git commit -am \"add dog sound\"\n&#91;animal dd434e0&#93; add dog sound\n 1 file changed, 3 insertions(+)<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 animal <\/span><span style=\"color: #F47067\">!1&gt;<\/span><span style=\"color: #ADBAC7\">  git commit -am <\/span><span style=\"color: #96D0FF\">&quot;add dog sound&quot;<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">&#91;animal dd434e0&#93; add dog sound<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">file<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changed,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">3<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">insertions<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F69D50\">+<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>-am\uc744 \uc635\uc158\uc744 \uc0ac\uc6a9\ud574\uc11c add \ub2e8\uacc4\ub97c \uc0dd\ub7b5\ud588\ub2e4.<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"214\" height=\"236\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase02-1.png\" alt=\"\" class=\"wp-image-5323\"\/><\/figure>\n<\/div>\n\n\n<p>\ub610 \ud558\ub098 \uc218\uc815\ud574\uc11c commit \ud558\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">animal\/sayings.py<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>...\ndef meow():\n    print(\"meow~\")\n...<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">meow<\/span><span style=\"color: #ADBAC7\">():<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #96D0FF\">&quot;meow~&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 animal !1>  git commit -am \"add cat sound\"\n&#91;animal e5e4aa7&#93; add cat sound\n 1 file changed, 3 insertions(+)<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 animal <\/span><span style=\"color: #F47067\">!1&gt;<\/span><span style=\"color: #ADBAC7\">  git commit -am <\/span><span style=\"color: #96D0FF\">&quot;add cat sound&quot;<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">&#91;animal e5e4aa7&#93; add cat sound<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">file<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changed,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">3<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">insertions<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F69D50\">+<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"341\" height=\"183\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase03-2.png\" alt=\"\" class=\"wp-image-5337\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase03-2.png 341w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase03-2-300x161.png 300w\" sizes=\"auto, (max-width: 341px) 100vw, 341px\" \/><\/figure>\n<\/div>\n\n\n<p>\uc774\uc81c \ub2e4\uc2dc main\uc73c\ub85c \ub3cc\uc544\uac00\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 animal>  git switch main\nSwitched to branch 'main'<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 animal<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;main&#39;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>main \uc5d0\uc11c\ub3c4 \uc218\uc815\uc0ac\ud56d\uc744 \ub9cc\ub4e0\ub2e4. \uc77c\ubd80\ub7ec \ucda9\ub3cc\uc774 \uc0dd\uae30\uac8c sayings.py\ub97c \uc218\uc815\ud558\uaca0\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">main\/sayings.py<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>...\ndef love(name):\n    print(f\"I love {name}\")\n\ndef ask(name):\n    print(f\"Who is {name}?\")\n...<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">love<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;I love <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">ask<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;Who is <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">?&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #6CB6FF\">...<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main !1>  git commit -am \"add love and ask func.\"\n&#91;main b7ae4b0&#93; add love and ask func.\n 1 file changed, 6 insertions(+)<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main <\/span><span style=\"color: #F47067\">!1&gt;<\/span><span style=\"color: #ADBAC7\">  git commit -am <\/span><span style=\"color: #96D0FF\">&quot;add love and ask func.&quot;<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">&#91;main b7ae4b0&#93; add love and ask func.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">file<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changed,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">6<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">insertions<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F69D50\">+<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"341\" height=\"231\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase04-2.png\" alt=\"\" class=\"wp-image-5339\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase04-2.png 341w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase04-2-300x203.png 300w\" sizes=\"auto, (max-width: 341px) 100vw, 341px\" \/><\/figure>\n<\/div>\n\n\n<p>\ub208\uc5d0 \ub4e4\uc5b4\uc624\ub3c4\ub85d \uadf8\ub798\ud504\ub97c \uacc4\uc18d \uadf8\ub824\uc654\ub294\ub370, Git graph\ub85c\ub3c4 \uadf8\ub798\ud504\ub97c \ud55c \ubc88 \ubcfc\uae4c?<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"797\" height=\"190\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch13.png\" alt=\"\" class=\"wp-image-4918\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch13.png 797w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch13-300x72.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch13-768x183.png 768w\" sizes=\"auto, (max-width: 797px) 100vw, 797px\" \/><\/figure>\n<\/div>\n\n\n<p>animal \ube0c\ub79c\uce58\ub294 \uadf8\ub798\ud504\uc5d0\uc11c new_feature\uac00 \uc788\ub294 a83283bd commit \uc774 \uc2dc\uc791\uc810\uc774\uba70, \uc774\uac8c \ubc14\ub85c \ubca0\uc774\uc2a4\uc774\ub2e4. main \ube0c\ub79c\uce58\ub294 \ubcc4\ub3c4\ub85c \ubcc0\uacbd\uc0ac\ud56d\uc774 \uc0dd\uaca8 commit\uc774 \ucd94\uac00\ub41c\uac78 \ubcfc \uc218 \uc788\ub2e4. rebase \ub77c\ub294\uac74 \uc800 animal \ube0c\ub79c\uce58\ub97c \ub611! \ub5bc\uc5b4\ub0b4\uc11c main \ube0c\ub79c\uce58\uc5d0 \uc811\ubd99\uc774\ub4ef \ubd99\uc774\ub294\uac78 \ub9d0\ud55c\ub2e4. \uadf8\ub7ec\uba74 animal\uc758 base\ub294 b7ae4b01 commit\uc774 \ub41c\ub2e4.<\/p>\n\n\n\n<p>git merge\ub294 \ub2e4\ub978\uac78 \uac00\uc838\uc640 \ud569\uce58\ub294 \uc791\uc5c5\uc774\uae30 \ub54c\ubb38\uc5d0, HEAD\uac00 \ucd5c\uc885\uc801\uc73c\ub85c \ubcd1\ud569\uc774 \uc774\ub8e8\uc5b4\uc9c0\ub294 main \ube0c\ub79c\uce58\uc5d0\uc11c \uba85\ub839\uc744 \uc218\ud589\ud588\ub2e4. \uc8fc\uccb4\uac00 main\uc774\ub780 \uc598\uae30\ub2e4. \ubc18\uba74\uc5d0, rebase\ub294 animal \ube0c\ub79c\uce58\uac00 \uc8fc\uccb4\uc774\uace0 \uc774 \ube0c\ub79c\uce58\uc5d0 \uc774\uc0ac\uac08 base\ub9cc \uc8fc\uc5b4\uc9c0\ub294 \uac83\uc774\uae30 \ub54c\ubb38\uc5d0, \ud604\uc7ac HEAD\uac00 animal \ube0c\ub79c\uce58\uc778 \uc0c1\ud0dc\uc5d0\uc11c \uba85\ub839\uc5b4\ub97c \uc785\ub825\ud55c\ub2e4. <\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 main>  git switch animal\nSwitched to branch 'animal'<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch animal<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;animal&#39;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>git rebase \uc758 \uae30\ubcf8 \uc0ac\uc6a9\ubc95\uc740 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git rebase &lt;new base><\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F69D50\">git<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">rebase<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F47067\">&lt;<\/span><span style=\"color: #96D0FF\">new<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">bas<\/span><span style=\"color: #ADBAC7\">e<\/span><span style=\"color: #F47067\">&gt;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>animal\uc744 main\uc73c\ub85c rebase \ud574\ubcf4\uc790.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 animal>  git rebase main\nAuto-merging sayings.py\nCONFLICT (content): Merge conflict in sayings.py\nerror: could not apply dd434e0... add dog sound\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add\/rm &lt;conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nhint: Disable this message with \"git config set advice.mergeConflict false\"<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 animal<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git rebase main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Auto-merging<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">sayings.py<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">CONFLICT<\/span><span style=\"color: #ADBAC7\"> (content): Merge conflict <\/span><span style=\"color: #F47067\">in<\/span><span style=\"color: #ADBAC7\"> sayings.py<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">error:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">could<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">not<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">apply<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">dd434e0...<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">add<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">dog<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">sound<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">hint:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">Resolve<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">all<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">conflicts<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">manually,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">mark<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">them<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">as<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">resolved<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">with<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">hint:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git add\/rm &lt;conflicted_files&gt;&quot;,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">then<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">run<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git rebase --continue&quot;.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">hint:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">You<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">can<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">instead<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">skip<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">this<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">commit:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">run<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git rebase --skip&quot;.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">hint:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">To<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">abort<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">get<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">back<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">the<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">state<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">before<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git rebase&quot;,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">run<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git rebase --abort&quot;.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">hint:<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">Disable<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">this<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">message<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">with<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&quot;git config set advice.mergeConflict false&quot;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ub0b4\uc6a9\uc744 \uc798\ubcf4\uba74 \ucda9\ub3cc(conflict)\uac00 \ubc1c\uc0dd\ud588\ub294\ub370 \ud765\ubbf8\ub86d\ub2e4. &#8220;error: could not apply dd434e0&#8230;&#8221; \uc774\ub77c\uace0 \ub098\uc628\ub2e4. \uc774\uac74 animal \ube0c\ub79c\uce58\ub97c \ub9cc\ub4e0 \ud6c4, \uccab\ubc88\uc9f8 commit \ub0b4\uc6a9\uc774\ub2e4. \ub208\uce58 \ucc58\uc744\uc9c0 \ubaa8\ub974\uaca0\uc9c0\ub9cc, \ube0c\ub79c\uce58 \uc804\uccb4\ub97c \ub611 \ub5bc\uc5b4\ub0b4\uc11c \uc0c8\ub85c\uc6b4 base\uc5d0 \ubd99\uc774\ub294 \uc791\uc5c5\uc740 commit \ud558\ub098\uc529 fetch\ub97c \ub9cc\ub4e4\uc5b4 merge\uc791\uc5c5\uc774 \uc9c4\ud589\uc774 \ub41c\ub2e4\ub294 \uc598\uae30\uc774\ub2e4. \uc989, commit\uc774 \uc5ec\ub7ec\uac1c\uc774\uace0 \ucda9\ub3cc\uc774 \uac01\uac01 \ubc1c\uc0dd\uc744 \ud558\ub294 \uacbd\uc6b0, \ud55c\ub540\ud55c\ub540 merge\uc791\uc5c5\uc744 \ud574\uc57c\ud55c\ub2e4. \ub610\ud55c, git merge\ub3c4 \uc5ec\ub7ec\ub2e8\uacc4\uc5d0 \uac70\uccd0 \uc9c4\ud589\ub418\ub2e4\uac00 &#8211;abort \uc635\uc158\uc744 \uc0ac\uc6a9\ud574 \ucde8\uc18c\ud558\ub4ef git rebase &#8211;abort\ub85c \ucde8\uc18c\ud560 \uc218\ub3c4 \uc788\ub2e4.<\/p>\n\n\n\n<p>\ud558\ub098\uc529 merge\ub97c \ud574\ubcf4\uc790. \ucf54\ub4dc\ub97c \ub4e4\uc5ec\ub2e4\ubcf4\uba74,<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(2 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Python<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\ndef love(name):\n    print(f\"I love {name}\")\n\ndef ask(name):\n    print(f\"Who is {name}?\")\n=======\ndef bark():\n    print(f\"bow wow\")\n>>>>>>> dd434e0 (add dog sound)<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">HEAD<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">love<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;I love <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">ask<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;Who is <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">?&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">=======<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">bark<\/span><span style=\"color: #ADBAC7\">():<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;bow wow&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/span><span style=\"color: #ADBAC7\"> dd434e0 (add dog sound)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ucda9\ub3cc\uc774 \ub09c \ub0b4\uc6a9\uc744 diff\ub97c \uc774\uc6a9\ud574 \ud45c\uc2dc\ud574\uc8fc\uace0 \uc788\ub2e4. merge\ub54c\uc640 \ub9c8\ucc2c\uac00\uc9c0\ub85c \ub0b4\uc6a9\uc744 \ud569\uccd0\uc8fc\uc790. \ub458 \ub2e4 \uc0b4\ub9ac\ub294 \ucabd\uc73c\ub85c \uc9c4\ud589\ud558\uaca0\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">sayings.py<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>def love(name):\n    print(f\"I love {name}\")\n\ndef ask(name):\n    print(f\"Who is {name}?\")\n\ndef bark():\n    print(f\"bow wow\")\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">love<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;I love <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">ask<\/span><span style=\"color: #ADBAC7\">(name):<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;Who is <\/span><span style=\"color: #F47067\">{<\/span><span style=\"color: #ADBAC7\">name<\/span><span style=\"color: #F47067\">}<\/span><span style=\"color: #96D0FF\">?&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">def<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #DCBDFB\">bark<\/span><span style=\"color: #ADBAC7\">():<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">    <\/span><span style=\"color: #6CB6FF\">print<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F47067\">f<\/span><span style=\"color: #96D0FF\">&quot;bow wow&quot;<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 @b7ae4b01 rebase-i 1\/2 +1>  git add sayings.py\n\n~\/g\/myproject \u2502 @b7ae4b01 rebase-i 1\/2 +1>  git commit sayings.py -m \"conflict resolved\"\n&#91;detached HEAD 1d9d3e7&#93; conflict resolved\n 1 file changed, 3 insertions(+)\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 @b7ae4b01 rebase-i 1\/2 +<\/span><span style=\"color: #F47067\">1&gt;<\/span><span style=\"color: #ADBAC7\">  git add sayings.py<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 @b7ae4b01 rebase-i 1\/2 +<\/span><span style=\"color: #F47067\">1&gt;<\/span><span style=\"color: #ADBAC7\">  git commit sayings.py -m <\/span><span style=\"color: #96D0FF\">&quot;conflict resolved&quot;<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\">&#91;detached HEAD <\/span><span style=\"color: #6CB6FF\">1<\/span><span style=\"color: #ADBAC7\">d9d3e7&#93; conflict resolved<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">file<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changed,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">3<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">insertions<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F69D50\">+<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span><\/code><\/pre><\/div>\n\n\n\n<p><\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"441\" height=\"204\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase05-6.png\" alt=\"\" class=\"wp-image-5354\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase05-6.png 441w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase05-6-300x139.png 300w\" sizes=\"auto, (max-width: 441px) 100vw, 441px\" \/><\/figure>\n<\/div>\n\n\n<p>\uba54\uc138\uc9c0\uc5d0\uc11c detached HEAD\ub77c\uace0 \ub72c\ub2e4. \uc9c1\uc811 \uadf8\ub798\ud504\ub97c \uadf8\ub9ac\uace0 \uc788\uae34 \ud558\uc9c0\ub9cc Git graph\ub85c \ubcf4\uba74,<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"788\" height=\"177\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch14.png\" alt=\"\" class=\"wp-image-4926\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch14.png 788w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch14-300x67.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch14-768x173.png 768w\" sizes=\"auto, (max-width: 788px) 100vw, 788px\" \/><\/figure>\n<\/div>\n\n\n<p> merge \ub41c commit\uc774 \uc0c8\ub85c \uc0dd\uae30\uace0 HEAD\uac00 \uac70\uae30\ub85c \uc774\ub3d9\ud588\uc74c\uc744 \uc54c \uc218 \uc788\ub2e4. \uc544\uc9c1\uc740 rebase\uac00 \uc9c4\ud589\uc911\uc778 \uacfc\uc815\uc774\ub77c animal \ube0c\ub79c\uce58\ub294 \uadf8\ub300\ub85c \uc720\uc9c0\ub418\ub294\uac8c \ubcf4\uc778\ub2e4. \uacc4\uc18d \uc9c4\ud589\ud574\ubcf4\uc790. rebase \ub97c \uacc4\uc18d\ud558\uae30 \uc704\ud574\uc11c\ub294 \ub2e4\uc74c &#8211;continue \uc635\uc158\uc744 \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git rebase --continue<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F69D50\">git<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">rebase<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">--continue<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 @1d9d3e7e rebase-i 1\/2  git rebase --continue    \u2714 \u2502 21:25:43 \nSuccessfully rebased and updated refs\/heads\/animal.<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 @1d9d3e7e rebase-i 1\/2  git rebase --continue    \u2714 \u2502 21:25:43 <\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Successfully<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">rebased<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">and<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">updated<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">refs\/heads\/animal.<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ub450\ubc88\uc9f8 commit\uc740 \ucda9\ub3cc\uc5c6\uc774 merge\uac00\ub418\uc11c \uc790\ub3d9\uc73c\ub85c \uc9c4\ud589\uc774 \ub410\ub2e4.<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"556\" height=\"203\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase06.png\" alt=\"\" class=\"wp-image-5355\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase06.png 556w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase06-300x110.png 300w\" sizes=\"auto, (max-width: 556px) 100vw, 556px\" \/><\/figure>\n<\/div>\n\n\n<p>merge\uac00 \ub2e4 \uc774\ub8e8\uc5b4\uc9c4 \ud6c4, <\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"480\" height=\"132\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase07.png\" alt=\"\" class=\"wp-image-5359\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase07.png 480w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase07-300x83.png 300w\" sizes=\"auto, (max-width: 480px) 100vw, 480px\" \/><\/figure>\n<\/div>\n\n\n<p>\uae30\uc874\uc758 animal \ube0c\ub79c\uce58\uac00 \uc0ad\uc81c\ub418\uace0 \ucd5c\uc885\uc801\uc73c\ub85c main\uc744 base\ub85c \ud558\ub294 \ube0c\ub79c\uce58\uac00 \ub418\uc5c8\ub2e4. commit \ud558\ub098\uc529 merge\uac00 \ub418\ub294 \uacfc\uc815\uc744 \uac70\uce58\uc9c0\ub9cc, \ucd5c\uc885\uc801\uc73c\ub85c animal \ube0c\ub79c\uce58\uac00 \uc0c8\ub85c\uc6b4 \ubca0\uc774\uc2a4\ub85c \uc9c0\uc815\ud574\uc900 commit\uc778 b7ae4b01(main) \uc5d0 \ubd99\uc740 \ube0c\ub79c\uce58\uac00 \ub418\uc5c8\ub2e4.<\/p>\n\n\n\n<p> Git graph\ub85c \uc0b4\ud3b4\ubcf4\uc790.<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"792\" height=\"177\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch15.png\" alt=\"\" class=\"wp-image-4930\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch15.png 792w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch15-300x67.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch15-768x172.png 768w\" sizes=\"auto, (max-width: 792px) 100vw, 792px\" \/><\/figure>\n<\/div>\n\n\n<p>\uae30\uc874\uc5d0 \ubcc4\ub3c4\ub85c \uc874\uc7ac\ud558\ub358 animal \ube0c\ub79c\uce58\uc758 \uac01 commit\ub4e4\uc774 \uadf8\ub300\ub85c main \uc704\ucabd\uc73c\ub85c \ud558\ub098\uc529 merge\ub418\uc5b4 \ubd99\uc740\uac78 \ubcfc \uc218 \uc788\ub2e4. <\/p>\n\n\n\n<p>\ub9c8\uc9c0\ub9c9\uc73c\ub85c main \ube0c\ub79c\uce58\ub97c HEAD \uc704\uce58, \uc989, \uc0c8\ub85c \uc62e\uaca8\uc9c4 animal \ube0c\ub79c\uce58\ub85c \uc774\ub3d9\uc2dc\ucf1c\uc57c \ud558\ub294\ub370 \uc774\ubbf8 main\uc744 base\ub85c commit\uc774 \uc9c4\ud589\ub41c \uc0c1\ud0dc\uae30 \ub54c\ubb38\uc5d0 \uac04\ub2e8\ud558\uac8c \ub2e4\uc74c\uc758 \uba85\ub839\uc5b4\ub85c \uc218\ud589\uc774 \ub41c\ub2e4.<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro cbp-has-line-numbers\" data-code-block-pro-font-family=\"Code-Pro-Roboto-Mono.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-Roboto-Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;--cbp-line-number-color:#adbac7;--cbp-line-number-width:calc(1 * 0.6 * .875rem);line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 0 16px;font-size:0.8em;width:100%;text-align:left;background-color:#22272e;font-style:italic;color:#adbac7\"><span style=\"border-bottom:1px solid rgba(139, 186, 234, 0.2)\">Zsh<\/span><\/span><span role=\"button\" tabindex=\"0\" style=\"color:#adbac7;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>~\/g\/myproject \u2502 animal>  git switch main\nSwitched to branch 'main'\n\n~\/g\/myproject \u2502 main>  git merge animal\nUpdating b7ae4b0..59513b6\nFast-forward\n sayings.py | 6 ++++++\n 1 file changed, 6 insertions(+)\n<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2\"><\/path><\/svg><\/span><pre class=\"shiki github-dark-dimmed\" style=\"background-color: #22272e\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 animal<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git switch main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Switched<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">to<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">branch<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">&#39;main&#39;<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #F47067\">~<\/span><span style=\"color: #ADBAC7\">\/g\/myproject \u2502 main<\/span><span style=\"color: #F47067\">&gt;<\/span><span style=\"color: #ADBAC7\">  git merge animal<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Updating<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">b7ae4b0..59513b6<\/span><\/span>\n<span class=\"line\"><span style=\"color: #F69D50\">Fast-forward<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">sayings.py<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F47067\">|<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">6<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">++++++<\/span><\/span>\n<span class=\"line\"><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #F69D50\">1<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">file<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">changed,<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #6CB6FF\">6<\/span><span style=\"color: #ADBAC7\"> <\/span><span style=\"color: #96D0FF\">insertions<\/span><span style=\"color: #ADBAC7\">(<\/span><span style=\"color: #F69D50\">+<\/span><span style=\"color: #ADBAC7\">)<\/span><\/span>\n<span class=\"line\"><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\ubcc4\ub2e4\ub978 \ubb38\uc81c\uc5c6\uc774 fast-forward \ud615\ud0dc\ub85c \uc9c4\ud589\ub41c\uac78 \ubcfc \uc218 \uc788\ub2e4. <\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"480\" height=\"161\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase09.png\" alt=\"\" class=\"wp-image-5362\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase09.png 480w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/05\/rebase09-300x101.png 300w\" sizes=\"auto, (max-width: 480px) 100vw, 480px\" \/><\/figure>\n<\/div>\n\n\n<p>Git graph\ub97c \uc0b4\ud3b4\ubcf4\uba74,<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"785\" height=\"155\" src=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch16.png\" alt=\"\" class=\"wp-image-4933\" srcset=\"http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch16.png 785w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch16-300x59.png 300w, http:\/\/batmask.net\/wordpress\/wp-content\/uploads\/2026\/04\/branch16-768x152.png 768w\" sizes=\"auto, (max-width: 785px) 100vw, 785px\" \/><\/figure>\n<\/div>\n\n\n<p>\uc790\uc5f0\uc2a4\ub7fd\uac8c \uc9c1\uc120\uc0c1\uc5d0 main\uacfc animal \ube0c\ub79c\uce58\uac00 \uc874\uc7ac\ud55c\ub2e4. <\/p>\n\n\n\n<p>\uc815\ub9ac\ud574\ubcf4\uba74, rebase\ub97c \ud574\ub3c4 \uacb0\uacfc\ubb3c \uc790\uccb4\ub294 merge\uc640 \ub3d9\uc77c\ud558\ub2e4. \ub2ec\ub77c\uc9c0\ub294\uac74 commit \ud788\uc2a4\ud1a0\ub9ac\uc774\ub2e4. merge\ub294 \ube0c\ub79c\uce58\ub4e4\uc774 \uac01\uac01 \uc720\uc9c0\ub41c\ucc44\ub85c \ub0b4\uc6a9\ub9cc \ud569\uccd0\uc9c4\ub2e4. \uc774\uacbd\uc6b0, \ube0c\ub79c\uce58\uac00 \ub9e4\uc6b0 \ub9ce\uc544\uc9c0\uac8c \ub418\uba74 \ud63c\ub780\uc2a4\ub7ec\uc6b8 \uc218\ub3c4 \uc788\uace0, main\ube0c\ub79c\uce58\uc5d0\ub294 commit \ud788\uc2a4\ud1a0\ub9ac\ub294 \uc5c6\uc774 \ucd5c\uc885 \uacb0\uacfc\ubb3c\ub9cc \ubcd1\ud569\uc774 \ub418\ubbc0\ub85c \uc54c\uc544\ubcf4\uae30 \ud798\ub4e4 \uc218 \uc788\ub2e4. \ubc18\uba74, rebase\ub294 main\uc5d0 \uac01\uac01\uc758 commit \ud788\uc2a4\ud1a0\ub9ac\uac00 \uadf8\ub300\ub85c \ubcf4\uc5ec \uc774\ub825\uad00\ub9ac\uac00 \ud3b8\ub9ac\ud558\ub2e4. \ub300\uc2e0\uc5d0 \uae30\uc874 \ube0c\ub79c\uce58\ub294 \uc544\uc608 \uc0ac\ub77c\uc9c0\uac8c \ub41c\ub2e4. <\/p>\n\n\n\n<p>\uc704\uc5d0\uc11c \ubcf4\uc5ec\uc900 \uacfc\uc815\uc5d0\uc11c \uc2e4\uc218\ud55c \ubd80\ubd84\uc740 commit \uba54\uc138\uc9c0\ub97c \uc81c\ub300\ub85c \uc791\uc131\ud558\uc9c0 \uc54a\uc740 \ubd80\ubd84\uc774\ub2e4. rebase\ud558\uba74\uc11c merge\uac00 \ub420 \ub54c, \uae30\uc874 \ube0c\ub79c\uce58\uc5d0\uc11c \uc791\uc131\ud588\ub358 \uba54\uc138\uc9c0\ub97c \uc720\uc9c0\ud574\uc57c \ud558\ub294\ub370, \ub2e8\uc21c\ud788 &#8220;conflict resolved&#8221;\ub77c\uace0 \uc801\uc5c8\ub354\ub2c8, rebase\uc774\uc804\uc5d0 \uc788\ub358 commit \uba54\uc138\uc9c0\ub4e4\uc774 \uae30\uc874 \ube0c\ub79c\uce58\uac00 \uc0ac\ub77c\uc9c0\uba70 \uac19\uc774 \uc0ac\ub77c\uc838 \uace4\ub780\ud574\uc84c\ub2e4. <\/p>\n\n\n\n<p>merge\ub098 rebase\ub098 \uc7a5\ub2e8\uc810\uc774 \uc788\ub294\ub370, \uc77c\ub2e8 rebase\ub97c \ud558\uba74, \ube0c\ub79c\uce58 \uad00\ub9ac\uac00 \uae54\ub054\ud558\uace0 main\uc5d0\uc11c \ubaa8\ub4e0 history\uac00 \ubcf4\uc778\ub2e4\ub294 \uc810\uc774 \ub9e4\ub825\uc801\uc774\ub2e4. \uadf8\ub807\uc9c0\ub9cc commit \ud558\ub098\ud558\ub098 \ubcd1\ud569\ud574\uc57c \ud558\uba70 \ub9e4\ubc88 \ucda9\ub3cc\uc774 \ubc1c\uc0dd\ud560 \uacbd\uc6b0 \uc774\ub97c \ud574\uacb0\ud574\uc918\uc57c \ud55c\ub2e4. \uac00\uc7a5 \uce58\uba85\uc801\uc778 \ubb38\uc81c\ub294 \uc5ec\uae30\uc5d0\uc11c\ub294 \ubcf4\uc774\uc9c0 \uc54a\uc9c0\ub9cc, \ub4a4\uc5d0\uc11c \ub2e4\ub8f0 remote repository\ub97c \uc774\uc6a9\ud574 \uc5ec\ub7ec\uc0ac\ub78c\uc774 \uacf5\ub3d9 \uc791\uc5c5\uc744 \ud558\ub294 \uacbd\uc6b0, \ub2e4\ub978 \uc0ac\ub78c\uacfc \uac19\uc774 \uc791\uc5c5\ud558\ub358 \ube0c\ub79c\uce58\ub97c \uc544\uc608 \ub0a0\ub824\ubc84\ub9b4 \uc218\ub3c4 \uc788\uc5b4\uc11c \ub9e4\uc6b0 \uc8fc\uc758\uac00 \ud544\uc694\ud558\ub2e4. \uac00\uc774\ub4dc\uc5d0\uc11c\ub294 \uacf5\ub3d9\uc791\uc5c5\ud558\ub294 git\uc5d0 \ub178\ucd9c\ub41c \ube0c\ub79c\uce58\ub294 rebase \ub97c \ud558\uc9c0 \ub9d0\ub77c\uace0 \uad8c\ud558\uace0 \uc788\ub2e4. \ud63c\uc790\ud558\ub294 \uc791\uc5c5\uc740 rebase\ub97c \ub9d8\uaecf \uc368\ub3c4 \ub418\uc9c0\ub9cc, \uacf5\ub3d9\uc791\uc5c5\uc2dc\uc5d0\ub294 merge\ub97c \uc4f0\uc790&#8230; \uc815\ub3c4\ub85c \uc815\ub9ac\ub420\uac70 \uac19\ub2e4. <\/p>\n","protected":false},"excerpt":{"rendered":"<p>git merge \uc55e\uc5d0\uc11c \ud2b9\uc815 \uae30\ub2a5\uc744 \uac1c\ubc1c\ud558\uac70\ub098 \ud14c\uc2a4\ud2b8 \ud558\uae30\uc704\ud574 branch\ub97c \uc0dd\uc131\ud574\uc11c \uc791\uc5c5\uc744 \ud588\ub2e4\uace0 \uc0dd\uac01\ud574\ubcf4\uc790. \uae30\ub2a5\uc744 \ub2e4 \uad6c\ud604\ud558\uace0\ub098\uba74, \uc774\uac78 main \ube0c\ub79c\uce58\uc5d0 \ubc18\uc601\ud574\uc57c \ub2e4\ub978\uc0ac\ub78c\ub4e4\uc774 \uc0ac\uc6a9\ud558\uac70\ub098 \ub9b4\ub9ac\uc988\uc2dc\uc5d0 \ubc18\uc601\uc774 \ub420 \uac83\uc774\ub2e4. \ub610\ub294, \ubcc4\ub3c4\uc758 \ubc84\uc804\uc73c\ub85c \uad00\ub9ac\ud55c\ub2e4\uace0 \ud574\ub3c4 main \ube0c\ub79c\uce58\uc5d0\uc11c \uc9c4\ud589\ub41c \uc791\uc5c5 \ub0b4\uc6a9\uc744 \uc774 \ube0c\ub79c\uce58\uc5d0 \uc801\uc6a9\ud558\uace0 \uc2f6\uc744 \uac83\uc774\ub2e4. \uc774\ub807\uac8c \ud558\ub098\uc758 branch\uc758 \ubcc0\uacbd\uc0ac\ud56d\ub4e4\uc744 \ub2e4\ub978 branch\uc5d0 \ubcd1\ud569\uc2dc\ud0a4\uace0 \uc2f6\uc744 \ub54c <a href=\"http:\/\/batmask.net\/index.php\/2026\/05\/04\/4950\/\" class=\"btn btn-link continue-link\">\ub354 \uc77d\uae30<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[2],"tags":[67,621,622],"class_list":["post-4950","post","type-post","status-publish","format-standard","hentry","category-git","tag-git","tag-git-merge","tag-git-rebase"],"jetpack_featured_media_url":"","_links":{"self":[{"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/posts\/4950","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/comments?post=4950"}],"version-history":[{"count":103,"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/posts\/4950\/revisions"}],"predecessor-version":[{"id":5368,"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/posts\/4950\/revisions\/5368"}],"wp:attachment":[{"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/media?parent=4950"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/categories?post=4950"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/batmask.net\/index.php\/wp-json\/wp\/v2\/tags?post=4950"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}