{"id":1722,"date":"2026-06-26T16:34:31","date_gmt":"2026-06-26T16:34:31","guid":{"rendered":"https:\/\/wayhope.kro.kr\/?p=1722"},"modified":"2026-08-31T07:32:50","modified_gmt":"2026-08-31T07:32:50","slug":"git-%ec%8b%a4%eb%ac%b4-%ed%95%b5%ec%8b%ac-%ec%a0%95%eb%a6%ac","status":"publish","type":"post","link":"https:\/\/wayhope.kro.kr\/?p=1722","title":{"rendered":"Git \uc2e4\ubb34 \ud575\uc2ec \uc815\ub9ac"},"content":{"rendered":"\n

Git\uc740 \uc18c\uc2a4 \ucf54\ub4dc\uc758 \ubcc0\uacbd \uc774\ub825\uc744 \uad00\ub9ac\ud558\ub294 \ubd84\uc0b0 \ubc84\uc804 \uad00\ub9ac \uc2dc\uc2a4\ud15c\uc774\ub2e4.<\/p>\n\n\n\n

\uac1c\uc778 \ud504\ub85c\uc81d\ud2b8\uc5d0\uc11c\ub294 \ucf54\ub4dc\ub97c \uc548\uc804\ud558\uac8c \uc800\uc7a5\ud558\uace0 \uc774\uc804 \uc0c1\ud0dc\ub85c \ub418\ub3cc\ub9ac\ub294 \uc6a9\ub3c4\ub85c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc9c0\ub9cc, \ud300 \uac1c\ubc1c\uc5d0\uc11c\ub294 \uc5ed\ud560\uc774 \uc870\uae08 \ub354 \ud06c\ub2e4. \uc5ec\ub7ec \uac1c\ubc1c\uc790\uac00 \uac19\uc740 \ud504\ub85c\uc81d\ud2b8\ub97c \ub3d9\uc2dc\uc5d0 \uc218\uc815\ud558\uace0, \uac01\uc790\uc758 \uc791\uc5c5\uc744 \ubd84\ub9ac\ud558\uace0, \ubcc0\uacbd\uc0ac\ud56d\uc744 \uac80\ud1a0\ud55c \ub2e4\uc74c \ud558\ub098\uc758 \ucf54\ub4dc\ubca0\uc774\uc2a4\ub85c \ud569\uce58\ub294 \uacfc\uc815 \uc804\uccb4\ub97c \uad00\ub9ac\ud55c\ub2e4.<\/p>\n\n\n\n

\uc2e4\ubb34\uc5d0\uc11c Git\uc744 \uc0ac\uc6a9\ud55c\ub2e4\uba74 \ub2e8\uc21c\ud788 add<\/code>, commit<\/code>, push<\/code> \uba85\ub839\uc5b4\ub97c \uc544\ub294 \uac83\ubcf4\ub2e4 \ub2e4\uc74c \ud750\ub984\uc744 \uc774\ud574\ud558\ub294 \uac83\uc774 \uc911\uc694\ud558\ub2e4.<\/p>\n\n\n\n

Repository -> Clone \/ Fork -> Branch -> \uac1c\ubc1c -> Commit -> Push -> Pull Request -> Code Review -> \uc218\uc815 -> Merge -> \ucd5c\uc2e0 \ucf54\ub4dc \ub3d9\uae30\ud654\n<\/code><\/pre>\n\n\n\n
\ud300 \uac1c\ubc1c\uc5d0\uc11c Git\uc740 \uc0ac\uc2e4\uc0c1 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uc548\uc804\ud558\uac8c \uacf5\uc720\ud558\uace0 \ud1b5\ud569\ud558\uae30 \uc704\ud55c \ud611\uc5c5 \uc2dc\uc2a4\ud15c<\/strong>\uc73c\ub85c \uc0ac\uc6a9\ub41c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Repository<\/h2>\n\n\n\n
Repository\ub294 Git\uc774 \ud504\ub85c\uc81d\ud2b8\uc758 \ud30c\uc77c\uacfc \ubcc0\uacbd \uc774\ub825\uc744 \uad00\ub9ac\ud558\ub294 \uc800\uc7a5\uc18c\ub2e4.<\/p>\n\n\n\n
Repository\ub294 \ud06c\uac8c Local\uacfc Remote\ub85c \ub098\ub220\uc11c \uc0dd\uac01\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Repository -> Local Repository \/ Remote Repository\n<\/code><\/pre>\n\n\n\n
Local Repository -> \ub0b4 \ucef4\ud4e8\ud130\uc5d0 \uc874\uc7ac\nRemote Repository -> GitHub \/ GitLab \ub4f1\uc5d0 \uc874\uc7ac\n<\/code><\/pre>\n\n\n\n
\uac1c\ubc1c\uc790\ub294 \ub85c\uceec\uc5d0\uc11c \ucf54\ub4dc\ub97c \uc218\uc815\ud558\uace0 Commit\uc744 \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
\uadf8\ub9ac\uace0 Remote Repository\uc5d0 Push\ud558\uba74 \ub2e4\ub978 \uac1c\ubc1c\uc790\ub3c4 \ud574\ub2f9 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ud655\uc778\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Local Repository -> Push -> Remote Repository\n<\/code><\/pre>\n\n\n\n
\uc5ec\uae30\uc11c Git\uacfc GitHub\ub97c \uad6c\ubd84\ud574\uc57c \ud55c\ub2e4.<\/p>\n\n\n\n
Git -> \ubc84\uc804 \uad00\ub9ac \uc2dc\uc2a4\ud15c\nGitHub -> Git Repository\ub97c \ud638\uc2a4\ud305\ud558\uace0 \ud611\uc5c5 \uae30\ub2a5\uc744 \uc81c\uacf5\ud558\ub294 \uc11c\ube44\uc2a4\n<\/code><\/pre>\n\n\n\n
GitHub\uac00 \uc5c6\uc5b4\ub3c4 Git\uc740 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Clone<\/h2>\n\n\n\n
\uc774\ubbf8 \uc874\uc7ac\ud558\ub294 Repository\ub97c \ub0b4 \ucef4\ud4e8\ud130\ub85c \uac00\uc838\uc624\ub294 \uac83\uc774 Clone\uc774\ub2e4.<\/p>\n\n\n\n
git clone https:\/\/github.com\/example\/project.git\n<\/code><\/pre>\n\n\n\n
Clone\uc744 \ud558\uba74 \ud504\ub85c\uc81d\ud2b8 \ud30c\uc77c\ubfd0\ub9cc \uc544\ub2c8\ub77c Git\uc758 Repository \uc815\ubcf4\uc640 \uae30\uc874 Commit history\ub3c4 \ud568\uaed8 \uac00\uc838\uc628\ub2e4.<\/p>\n\n\n\n
\uc77c\ubc18\uc801\uc778 \ud68c\uc0ac \ud504\ub85c\uc81d\ud2b8\ub77c\uba74 \uac1c\ubc1c\uc790\ub294 \ucc98\uc74c Repository\ub97c Clone\ud55c \ub4a4 \uc790\uc2e0\uc758 \uc791\uc5c5 \ud658\uacbd\uc744 \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
Remote Repository -> Clone -> Local Repository\n<\/code><\/pre>\n\n\n\n
Clone\uc740 \ubcf4\ud1b5 \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucc98\uc74c \ucc38\uc5ec\ud560 \ub54c \ud55c \ubc88 \uc218\ud589\ud55c\ub2e4.<\/p>\n\n\n\n
\uadf8 \uc774\ud6c4\uc5d0\ub294 \ub9e4\ubc88 Clone\ud558\ub294 \uac83\uc774 \uc544\ub2c8\ub77c fetch<\/code>, pull<\/code> \ub4f1\uc744 \uc0ac\uc6a9\ud574\uc11c \ucd5c\uc2e0 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uac00\uc838\uc628\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Fork<\/h2>\n\n\n\n
Fork\ub294 Repository\ub97c \ub0b4 \uacc4\uc815 \uc544\ub798\uc5d0 \ubcf5\uc0ac\ud558\ub294 \uae30\ub2a5\uc774\ub2e4.<\/p>\n\n\n\n
\uc8fc\ub85c \uc624\ud508\uc18c\uc2a4 \ud504\ub85c\uc81d\ud2b8\ucc98\ub7fc \uc6d0\ubcf8 Repository\uc5d0 \uc9c1\uc811 Push \uad8c\ud55c\uc774 \uc5c6\ub294 \uacbd\uc6b0 \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
Original Repository -> Fork -> My Repository\n<\/code><\/pre>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 \uc6d0\ubcf8 Repository\uac00<\/p>\n\n\n\n
github.com\/company\/game-server\n<\/code><\/pre>\n\n\n\n
\uc774\uace0 \ub0b4 \uacc4\uc815\uc73c\ub85c Fork\ud558\uba74<\/p>\n\n\n\n
github.com\/my-account\/game-server\n<\/code><\/pre>\n\n\n\n
\uac19\uc740 \ubcc4\ub3c4\uc758 Repository\uac00 \uc0dd\uae34\ub2e4.<\/p>\n\n\n\n
\uc774\uc81c \ub0b4 Repository\uc5d0\ub294 Push\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Original Repository -> Fork -> My Repository -> Clone -> \ub0b4 PC\n<\/code><\/pre>\n\n\n\n
\uc5ec\uae30\uc11c \uc911\uc694\ud55c \uac83\uc740 Fork\uc640 Clone\uc740 \uc644\uc804\ud788 \ub2e4\ub978 \uac1c\ub150\uc774\ub77c\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n
Fork -> Remote Repository\ub97c \ub0b4 \uacc4\uc815\uc73c\ub85c \ubcf5\uc0ac\nClone -> Remote Repository\ub97c \ub0b4 \ucef4\ud4e8\ud130\ub85c \uac00\uc838\uc634\n<\/code><\/pre>\n\n\n\n
\n\n\n\n
Origin\uacfc Upstream<\/h2>\n\n\n\n
Fork Workflow\uc5d0\uc11c\ub294 Remote\ub97c \ub450 \uac1c \uc0ac\uc6a9\ud558\ub294 \uacbd\uc6b0\uac00 \ub9ce\ub2e4.<\/p>\n\n\n\n
origin -> \ub0b4 Fork Repository\nupstream -> \uc6d0\ubcf8 Repository\n<\/code><\/pre>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
git remote -v\n<\/code><\/pre>\n\n\n\n
\ub97c \uc2e4\ud589\ud558\uba74 \ub2e4\uc74c\uacfc \uac19\uc740 \ud615\ud0dc\uac00 \ub420 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
origin -> git@github.com:my-account\/project.git\nupstream -> git@github.com:company\/project.git\n<\/code><\/pre>\n\n\n\n
\uc791\uc5c5\ud55c \ucf54\ub4dc\ub294 \ub0b4 Repository\ub85c Push\ud55c\ub2e4.<\/p>\n\n\n\n
git push origin feature\/login\n<\/code><\/pre>\n\n\n\n
\uc6d0\ubcf8 Repository\uc758 \ucd5c\uc2e0 \ubcc0\uacbd\uc0ac\ud56d\uc740 upstream<\/code>\uc5d0\uc11c \uac00\uc838\uc628\ub2e4.<\/p>\n\n\n\n
git fetch upstream\n<\/code><\/pre>\n\n\n\n
\uc774 \uad6c\uc870\ub97c \uc774\ud574\ud558\uba74 \uc624\ud508\uc18c\uc2a4 \ud504\ub85c\uc81d\ud2b8\uc5d0 \uae30\uc5ec\ud558\ub294 \uacfc\uc815\uc774 \ud6e8\uc52c \uba85\ud655\ud574\uc9c4\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Branch<\/h2>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c\ub294 main<\/code>\uc5d0\uc11c \uc9c1\uc811 \uc791\uc5c5\ud558\uc9c0 \uc54a\ub294 \uac83\uc774 \uc77c\ubc18\uc801\uc774\ub2e4.<\/p>\n\n\n\n
\uc0c8\ub85c\uc6b4 \uae30\ub2a5\uc774\ub098 \ubc84\uadf8 \uc218\uc815\uc740 \ubcc4\ub3c4\uc758 Branch\uc5d0\uc11c \uc791\uc5c5\ud55c\ub2e4.<\/p>\n\n\n\n
main -> feature\/login \/ feature\/inventory \/ fix\/player-crash\n<\/code><\/pre>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
git switch main\ngit pull\ngit switch -c feature\/login\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc791\uc5c5 Branch\ub97c \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
Branch \uc774\ub984\uc740 \ud504\ub85c\uc81d\ud2b8 \uaddc\uce59\uc5d0 \ub9de\ucd94\uba74 \ub41c\ub2e4.<\/p>\n\n\n\n
\ub300\ud45c\uc801\uc73c\ub85c<\/p>\n\n\n\n
feature\/login\nfeature\/inventory\nfix\/player-crash\nrefactor\/network\nhotfix\/server-crash\n<\/code><\/pre>\n\n\n\n
\uac19\uc740 \ud615\ud0dc\ub97c \ub9ce\uc774 \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
\uc911\uc694\ud55c \uac83\uc740 Branch \ud558\ub098\uac00 \ud558\ub098\uc758 \uc791\uc5c5 \ubaa9\uc801\uc744 \uac00\uc9c0\ub3c4\ub85d \ub9cc\ub4dc\ub294 \uac83<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
\uc65c main\uc5d0\uc11c \uc9c1\uc811 \uac1c\ubc1c\ud558\uc9c0 \uc54a\ub294\uac00<\/h2>\n\n\n\n
main<\/code>\uc740 \uc77c\ubc18\uc801\uc73c\ub85c \ub2e4\ub978 \uac1c\ubc1c\uc790\ub4e4\uc774 \ud568\uaed8 \uc0ac\uc6a9\ud558\ub294 \uc548\uc815\uc801\uc778 \uae30\uc900 Branch\ub2e4.<\/p>\n\n\n\n
\uc5ec\uae30\uc11c \uc9c1\uc811 \uac1c\ubc1c\ud558\uba74 \uc791\uc5c5 \uc911\uc778 \ucf54\ub4dc\uac00 \ub2e4\ub978 \uc0ac\ub78c\uc5d0\uac8c \ubc14\ub85c \uc601\ud5a5\uc744 \uc904 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
main -> \uac1c\ubc1c\uc790 A\uc758 \uc791\uc5c5 \/ \uac1c\ubc1c\uc790 B\uc758 \uc791\uc5c5 \/ \uac1c\ubc1c\uc790 C\uc758 \uc791\uc5c5\n<\/code><\/pre>\n\n\n\n
\uc774\ub7f0 \uc0c1\ud0dc\uc5d0\uc11c\ub294 \uc11c\ub85c\uc758 \uc791\uc5c5\uc774 \uc27d\uac8c \uc11e\uc778\ub2e4.<\/p>\n\n\n\n
\ubc18\uba74 Feature Branch\ub97c \uc0ac\uc6a9\ud558\uba74<\/p>\n\n\n\n
main -> feature\/login \/ feature\/inventory \/ fix\/crash\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc791\uc5c5\uc744 \ubd84\ub9ac\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc791\uc5c5\uc774 \ub05d\ub09c \ub4a4 Pull Request\ub97c \ud1b5\ud574 \uac80\ud1a0\ud558\uace0 main<\/code>\uc5d0 \ud1b5\ud569\ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
\uac1c\ubc1c<\/h2>\n\n\n\n
Branch\ub97c \ub9cc\ub4e0 \ub2e4\uc74c \uc2e4\uc81c \uac1c\ubc1c\uc744 \uc9c4\ud589\ud55c\ub2e4.<\/p>\n\n\n\n
git switch -c feature\/inventory\n<\/code><\/pre>\n\n\n\n
\uc774\ud6c4 \ucf54\ub4dc\ub97c \uc218\uc815\ud558\uace0 \ud14c\uc2a4\ud2b8\ud55c\ub2e4.<\/p>\n\n\n\n
Branch \uc0dd\uc131 -> \ucf54\ub4dc \uc218\uc815 -> Build -> Test -> \ucf54\ub4dc \uc218\uc815 -> \ub2e4\uc2dc Test\n<\/code><\/pre>\n\n\n\n
\uc5ec\uae30\uc11c \uc911\uc694\ud55c \uac83\uc740 Git\uc744 \ubc31\uc5c5 \ub3c4\uad6c\ucc98\ub7fc \uc0ac\uc6a9\ud558\ub294 \uac83\uc774 \uc544\ub2c8\ub77c \uc791\uc5c5 \ub2e8\uc704\ubcc4\ub85c \ubcc0\uacbd\uc0ac\ud56d\uc744 \uad00\ub9ac\ud558\ub294 \uac83<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Commit<\/h2>\n\n\n\n
\uc791\uc5c5\ud55c \ub0b4\uc6a9\uc744 Commit\uc73c\ub85c \uae30\ub85d\ud55c\ub2e4.<\/p>\n\n\n\n
git add Player.cpp\ngit commit -m \"Add player inventory\"\n<\/code><\/pre>\n\n\n\n
Commit\uc740 \ub2e8\uc21c\ud55c \uc800\uc7a5\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\ud558\ub098\uc758 \uc758\ubbf8 \uc788\ub294 \ubcc0\uacbd\uc744 \uae30\ub85d\ud558\ub294 \uac83\uc774 \uc88b\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
Add inventory system\n<\/code><\/pre>\n\n\n\n
\uc774\ub77c\ub294 \uae30\ub2a5\uc744 \uac1c\ubc1c\ud558\uba74\uc11c<\/p>\n\n\n\n
Add inventory data model\nAdd inventory manager\nAdd inventory UI\nFix inventory slot validation\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc758\ubbf8 \uc788\ub294 \ub2e8\uc704\ub85c Commit\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ubc18\ub300\ub85c<\/p>\n\n\n\n
update\nfix\ntest\nfinal\nfinal2\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc758\ubbf8 \uc5c6\ub294 Commit\uc744 \uacc4\uc18d \ub9cc\ub4dc\ub294 \uac83\uc740 \ub098\uc911\uc5d0 history\ub97c \ud655\uc778\ud558\uae30 \uc5b4\ub835\uac8c \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Commit\uc744 \uc791\uac8c \ub9cc\ub4dc\ub294 \uc774\uc720<\/h2>\n\n\n\n
\uc791\uc740 Commit\uc740 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ucd94\uc801\ud558\uae30 \uc27d\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 \ubc84\uadf8\uac00 \ubc1c\uc0dd\ud588\uc744 \ub54c<\/p>\n\n\n\n
Commit A -> Player \uc774\ub3d9 \uc218\uc815\nCommit B -> Player \uacf5\uaca9 \uc218\uc815\nCommit C -> Inventory \uc218\uc815\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ub418\uc5b4 \uc788\ub2e4\uba74 \uc5b4\ub290 \ubcc0\uacbd\uc774 \ubb38\uc81c\ub97c \ub9cc\ub4e4\uc5c8\ub294\uc9c0 \ucd94\uc801\ud558\uae30 \uc27d\ub2e4.<\/p>\n\n\n\n
\ub610\ud55c \ud2b9\uc815 Commit\ub9cc \ub418\ub3cc\ub9ac\uac70\ub098 Cherry-pick\ud558\ub294 \uac83\ub3c4 \ud3b8\ud574\uc9c4\ub2e4.<\/p>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c\ub294 Commit\uc758 \uac1c\uc218\ubcf4\ub2e4 \uac01 Commit\uc758 \uc758\ubbf8\uac00 \uba85\ud655\ud55c\uc9c0<\/strong>\uac00 \uc911\uc694\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Push<\/h2>\n\n\n\n
Local\uc5d0\uc11c \ub9cc\ub4e0 Commit\uc744 Remote Repository\ub85c \ubcf4\ub0b4\ub294 \uac83\uc774 Push\ub2e4.<\/p>\n\n\n\n
git push origin feature\/inventory\n<\/code><\/pre>\n\n\n\n
\uadf8\ub7ec\uba74 Local\uacfc Remote\uc758 Commit \uc0c1\ud0dc\uac00 \ub3d9\uae30\ud654\ub41c\ub2e4.<\/p>\n\n\n\n
Local Repository -> Push -> Remote Repository\n<\/code><\/pre>\n\n\n\n
Fork Workflow\ub77c\uba74 origin<\/code>\uc774 \ub0b4 Repository\uc774\ubbc0\ub85c \ub0b4 Fork\uc5d0 Push\ud558\uac8c \ub41c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Pull Request<\/h2>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c Git\uc744 \uc0ac\uc6a9\ud558\ub294 \uac00\uc7a5 \uc911\uc694\ud55c \uacfc\uc815 \uc911 \ud558\ub098\ub2e4.<\/p>\n\n\n\n
Pull Request, \uc904\uc5ec\uc11c PR\uc740 \ub0b4 Branch\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ub2e4\ub978 Branch\uc5d0 \ubc18\uc601\ud574\ub2ec\ub77c\uace0 \uc694\uccad\ud558\ub294 \uac83<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
feature\/inventory -> Pull Request -> main\n<\/code><\/pre>\n\n\n\n
\uad6c\uc870\uac00 \ub41c\ub2e4.<\/p>\n\n\n\n
Git \uc790\uccb4\uc758 \uae30\ub2a5\uc774\ub77c\uae30\ubcf4\ub2e4 GitHub, GitLab \uac19\uc740 Git \ud638\uc2a4\ud305 \uc11c\ube44\uc2a4\uc5d0\uc11c \uc81c\uacf5\ud558\ub294 \ud611\uc5c5 \uae30\ub2a5\uc774\ub2e4.<\/p>\n\n\n\n
PR\uc5d0\ub294 \ubcf4\ud1b5 \ub2e4\uc74c \uc815\ubcf4\uac00 \ud3ec\ud568\ub41c\ub2e4.<\/p>\n\n\n\n
\uc81c\ubaa9 \/ \ubcc0\uacbd \ub0b4\uc6a9 \/ \ubcc0\uacbd \uc774\uc720 \/ \ud14c\uc2a4\ud2b8 \ubc29\ubc95 \/ \uc8fc\uc758\ud560 \uc0ac\ud56d \/ \uad00\ub828 Issue\n<\/code><\/pre>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
Title\n\nAdd player inventory system\n<\/code><\/pre>\n\n\n\n
\ubcf8\ubb38\uc5d0\ub294<\/p>\n\n\n\n
## \ubcc0\uacbd \ub0b4\uc6a9\n\n- Inventory \ub370\uc774\ud130 \uad6c\uc870 \ucd94\uac00\n- \uc544\uc774\ud15c \ucd94\uac00 \/ \uc81c\uac70 \uae30\ub2a5 \uad6c\ud604\n- \uc2ac\ub86f \uc81c\ud55c \uad6c\ud604\n\n## \ud14c\uc2a4\ud2b8\n\n- \uc544\uc774\ud15c \ucd94\uac00\n- \uc544\uc774\ud15c \uc81c\uac70\n- \uc2ac\ub86f \ucd08\uacfc \uc0c1\ud669 \ud655\uc778\n<\/code><\/pre>\n\n\n\n
\uac19\uc740 \ub0b4\uc6a9\uc744 \uc791\uc131\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Pull Request\uc758 \ubcf8\uc9c8<\/h2>\n\n\n\n
PR\uc740 \ub2e8\uc21c\ud788 \ucf54\ub4dc\ub97c main<\/code>\uc5d0 \ub123\ub294 \ubc84\ud2bc\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\ucf54\ub4dc \ubcc0\uacbd\uc744 \ub2e4\ub978 \uac1c\ubc1c\uc790\uc5d0\uac8c \uacf5\uac1c\ud558\uace0 \uac80\ud1a0\ubc1b\ub294 \uacfc\uc815<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\uac1c\ubc1c\uc790 -> Feature Branch -> Pull Request -> Code Review -> \uc2b9\uc778 -> Merge\n<\/code><\/pre>\n\n\n\n
Review \uacfc\uc815\uc5d0\uc11c \uc218\uc815 \uc694\uccad\uc774 \ubc1c\uc0dd\ud558\uba74<\/p>\n\n\n\n
Pull Request -> \uc218\uc815 \uc694\uccad -> \ucd94\uac00 Commit -> Push -> \uae30\uc874 PR \uac31\uc2e0\n<\/code><\/pre>\n\n\n\n
\ud615\ud0dc\ub85c \uc9c4\ud589\ub41c\ub2e4.<\/p>\n\n\n\n
\uadf8\ub798\uc11c PR\uc744 \ub9cc\ub4e4\uc5c8\ub2e4\uace0 \uac1c\ubc1c\uc774 \ub05d\ub09c \uac83\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
Review\uac00 \ub05d\ub098\uace0 Merge\ub420 \ub54c\uae4c\uc9c0\uac00 \ud558\ub098\uc758 \uc791\uc5c5 \uacfc\uc815\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Code Review<\/h2>\n\n\n\n
Reviewer\ub294 PR\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ud655\uc778\ud55c\ub2e4.<\/p>\n\n\n\n
\ubcf4\ud1b5 \ub2e4\uc74c\uacfc \uac19\uc740 \ubd80\ubd84\uc744 \ubcf8\ub2e4.<\/p>\n\n\n\n
\uae30\ub2a5\uc774 \uc694\uad6c\uc0ac\ud56d\uc5d0 \ub9de\ub294\uac00? \/ \ubc84\uadf8\uac00 \uc5c6\ub294\uac00? \/ \uae30\uc874 \ucf54\ub4dc\uc640 \ucda9\ub3cc\ud558\uc9c0 \uc54a\ub294\uac00? \/ \uc124\uacc4\uac00 \uc801\uc808\ud55c\uac00? \/ \ubd88\ud544\uc694\ud55c \ucf54\ub4dc\uac00 \ub4e4\uc5b4\uac14\ub294\uac00? \/ \uc131\ub2a5 \ubb38\uc81c\uac00 \uc5c6\ub294\uac00? \/ \ubcf4\uc548 \ubb38\uc81c\uac00 \uc5c6\ub294\uac00? \/ \ud14c\uc2a4\ud2b8\uac00 \ucda9\ubd84\ud55c\uac00?\n<\/code><\/pre>\n\n\n\n
\uc5ec\uae30\uc11c \uc911\uc694\ud55c \uac83\uc740 Code Review\uac00 \ucf54\ub4dc \uc2a4\ud0c0\uc77c\ub9cc \uac80\uc0ac\ud558\ub294 \uacfc\uc815\uc774 \uc544\ub2c8\ub77c\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n
\ubcc0\uacbd\ub41c \ucf54\ub4dc\uac00 \ud504\ub85c\uc81d\ud2b8\uc758 \uae30\uc874 \uad6c\uc870\uc640 \uc694\uad6c\uc0ac\ud56d\uc5d0 \uc801\ud569\ud55c\uc9c0 \ud310\ub2e8\ud558\ub294 \uacfc\uc815<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Review Comment<\/h2>\n\n\n\n
Reviewer\uac00 \ubb38\uc81c\uac00 \uc788\ub2e4\uace0 \ud310\ub2e8\ud558\uba74 PR\uc5d0 Comment\ub97c \ub0a8\uae34\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
\uc774 \ub85c\uc9c1\uc740 Player\uac00 \uc81c\uac70\ub41c \uc774\ud6c4\uc5d0\ub3c4 \ud638\ucd9c\ub420 \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4.\n\uc218\uba85 \uad00\ub9ac \ubc29\uc2dd\uc744 \ud655\uc778\ud574\uc8fc\uc138\uc694.\n<\/code><\/pre>\n\n\n\n
\uac1c\ubc1c\uc790\ub294 \ucf54\ub4dc\ub97c \uc218\uc815\ud558\uace0 \ub2e4\uc2dc Push\ud55c\ub2e4.<\/p>\n\n\n\n
git add .\ngit commit -m \"Fix player lifetime handling\"\ngit push origin feature\/inventory\n<\/code><\/pre>\n\n\n\n
\uadf8\ub7ec\uba74 \uae30\uc874 PR\uc5d0 \uc0c8\ub85c\uc6b4 Commit\uc774 \uc790\ub3d9\uc73c\ub85c \ubc18\uc601\ub41c\ub2e4.<\/p>\n\n\n\n
PR\uc744 \uc0c8\ub85c \ub9cc\ub4e4 \ud544\uc694\ub294 \uc5c6\ub2e4.<\/p>\n\n\n\n
PR -> Commit A \/ Commit B \/ Commit C\n<\/code><\/pre>\n\n\n\n
\uc774\ub807\uac8c \ubcc0\uacbd\uc0ac\ud56d\uc774 \uacc4\uc18d \ub204\uc801\ub41c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Merge<\/h2>\n\n\n\n
Review\uac00 \ub05d\ub098\uace0 \uc2b9\uc778\uc774 \ub418\uba74 Feature Branch\ub97c \ub300\uc0c1 Branch\uc5d0 Merge\ud55c\ub2e4.<\/p>\n\n\n\n
feature\/inventory -> Merge -> main\n<\/code><\/pre>\n\n\n\n
GitHub\ub098 GitLab\uc5d0\uc11c\ub294 PR \ud654\uba74\uc5d0\uc11c Merge \ubc84\ud2bc\uc744 \ud1b5\ud574 \ucc98\ub9ac\ud558\ub294 \uacbd\uc6b0\uac00 \ub9ce\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Squash Merge<\/h2>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c\ub294 Squash Merge\ub3c4 \ub9ce\uc774 \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
Feature Branch\uc5d0\uc11c<\/p>\n\n\n\n
D -> E -> F -> G -> H\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc5ec\ub7ec Commit\uc744 \ub9cc\ub4e4\uc5c8\ub2e4\uace0 \ud558\uc790.<\/p>\n\n\n\n
Squash Merge\ub97c \uc0ac\uc6a9\ud558\uba74 \uc774\ub4e4\uc744 \ud558\ub098\uc758 Commit\uc73c\ub85c \ud569\uccd0\uc11c main<\/code>\uc5d0 \ubc18\uc601\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Feature Branch -> D \/ E \/ F \/ G \/ H -> Squash -> main -> S\n<\/code><\/pre>\n\n\n\n
\uc5ec\uae30\uc11c S<\/code>\ub294 Feature Branch\uc758 \uc804\uccb4 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ud558\ub098\ub85c \ud569\uce5c Commit\uc774\ub2e4.<\/p>\n\n\n\n
Feature Branch\uc5d0\uc11c \uc791\uc5c5 \uacfc\uc815 \uc911 Commit\uc774 \ub9ce\ub354\ub77c\ub3c4 main<\/code>\uc758 history\ub294 \uae54\ub054\ud558\uac8c \uc720\uc9c0\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Merge Commit<\/h2>\n\n\n\n
\uc77c\ubc18\uc801\uc778 Merge\ub294 Branch\uac00 \ud569\uccd0\uc9c4 \uc0ac\uc2e4\uc744 history\uc5d0 \ub0a8\uae34\ub2e4.<\/p>\n\n\n\n
main -> Merge Commit -> feature\/inventory\n<\/code><\/pre>\n\n\n\n
Branch\uac00 \uc5b4\ub5bb\uac8c \ubd84\uae30\ub418\uace0 \ud569\uccd0\uc84c\ub294\uc9c0\ub97c \uadf8\ub300\ub85c \ubcfc \uc218 \uc788\ub2e4\ub294 \uc7a5\uc810\uc774 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Rebase Merge<\/h2>\n\n\n\n
Rebase\ub97c \uc774\uc6a9\ud574 Feature Branch\uc758 Commit\uc744 \ucd5c\uc2e0 main<\/code> \uc704\ub85c \uc7ac\ubc30\uce58\ud55c \ub4a4 \ud1b5\ud569\ud558\ub294 \ubc29\uc2dd\ub3c4 \uc788\ub2e4.<\/p>\n\n\n\n
\uae30\uc874 -> A -> B -> C -> D -> E\nRebase -> A -> B -> C -> D' -> E'\n<\/code><\/pre>\n\n\n\n
History\uac00 \uc120\ud615\uc801\uc73c\ub85c \uc720\uc9c0\ub41c\ub2e4.<\/p>\n\n\n\n
\ub2e4\ub9cc Rebase\ub294 Commit history\ub97c \uc7ac\uc791\uc131\ud558\uae30 \ub54c\ubb38\uc5d0 \uc774\ubbf8 \uc5ec\ub7ec \uc0ac\ub78c\uc774 \uacf5\uc720\ud55c Branch\uc5d0\uc11c \ud568\ubd80\ub85c \uc0ac\uc6a9\ud558\ub294 \uac83\uc740 \ud53c\ud574\uc57c \ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
\uc138 \uac00\uc9c0 Merge \ubc29\uc2dd<\/h2>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c PR\uc744 Merge\ud560 \ub54c \uc790\uc8fc \uc811\ud558\uac8c \ub418\ub294 \ubc29\uc2dd\uc740 \ub2e4\uc74c \uc138 \uac00\uc9c0\ub2e4.<\/p>\n\n\n\n
Merge Commit -> Branch history\ub97c \uadf8\ub300\ub85c \uc720\uc9c0\nSquash Merge -> PR\uc758 Commit\uc744 \ud558\ub098\ub85c \ud569\uce68\nRebase Merge -> Commit\uc744 \uc120\ud615\uc801\uc73c\ub85c \uc7ac\ubc30\uce58\n<\/code><\/pre>\n\n\n\n
\ud300\ub9c8\ub2e4 \uc815\ucc45\uc774 \ub2e4\ub974\uae30 \ub54c\ubb38\uc5d0 \ud504\ub85c\uc81d\ud2b8\uc758 Git \uc804\ub7b5\uc744 \ub530\ub77c\uc57c \ud55c\ub2e4.<\/p>\n\n\n\n
\uac1c\uc778\uc801\uc73c\ub85c \uc5b4\ub5a4 \ubc29\uc2dd\uc774 \ubb34\uc870\uac74 \uc815\ub2f5\uc774\ub77c\uace0 \ubcfc \uc218\ub294 \uc5c6\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Merge \ud6c4 Branch \uc815\ub9ac<\/h2>\n\n\n\n
PR\uc774 Merge\ub418\uba74 \uc791\uc5c5 Branch\ub294 \ub354 \uc774\uc0c1 \ud544\uc694\ud558\uc9c0 \uc54a\uc740 \uacbd\uc6b0\uac00 \ub9ce\ub2e4.<\/p>\n\n\n\n
Remote Branch\ub97c \uc0ad\uc81c\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
git push origin --delete feature\/inventory\n<\/code><\/pre>\n\n\n\n
Local Branch\ub3c4 \uc0ad\uc81c\ud55c\ub2e4.<\/p>\n\n\n\n
git branch -d feature\/inventory\n<\/code><\/pre>\n\n\n\n
\uadf8\ub9ac\uace0 \ucd5c\uc2e0 main<\/code>\uc73c\ub85c \ub3cc\uc544\uac04\ub2e4.<\/p>\n\n\n\n
git switch main\ngit pull\n<\/code><\/pre>\n\n\n\n
\uc0c8\ub85c\uc6b4 \uc791\uc5c5\uc744 \uc2dc\uc791\ud560 \ub54c \ub2e4\uc2dc Branch\ub97c \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
git switch -c feature\/new-system\n<\/code><\/pre>\n\n\n\n
\n\n\n\n
Fork Workflow<\/h2>\n\n\n\n
\uc624\ud508\uc18c\uc2a4 \ud504\ub85c\uc81d\ud2b8\ucc98\ub7fc \uc6d0\ubcf8 Repository\uc5d0 \uc9c1\uc811 Push\ud560 \uc218 \uc5c6\ub294 \uacbd\uc6b0\uc5d0\ub294 Fork Workflow\ub97c \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
\uc804\uccb4 \uacfc\uc815\uc740 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n\n
Original Repository -> Fork -> My Repository -> Clone -> Local Repository -> Branch \uc0dd\uc131 -> \uac1c\ubc1c -> Commit -> Push -> My Repository -> Pull Request -> Original Repository -> Code Review -> Merge\n<\/code><\/pre>\n\n\n\n
\uc774\uac83\uc774 \uc77c\ubc18\uc801\uc778 \uc624\ud508\uc18c\uc2a4 \uae30\uc5ec Workflow\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Fork Repository \ub3d9\uae30\ud654<\/h2>\n\n\n\n
Fork\ub97c \ud574\ub193\uace0 \uc2dc\uac04\uc774 \uc9c0\ub098\uba74 \uc6d0\ubcf8 Repository\uc758 main<\/code>\uc5d0\ub294 \uacc4\uc18d \uc0c8\ub85c\uc6b4 Commit\uc774 \ub4e4\uc5b4\uc628\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
Original -> A -> B -> C -> D -> E\nMy Fork -> A -> B -> C\n<\/code><\/pre>\n\n\n\n
\ub0b4 Fork\uac00 \uc624\ub798\ub41c \uc0c1\ud0dc\uac00 \ub418\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n
\uc774\ub54c upstream<\/code>\uc744 \ud1b5\ud574 \uc6d0\ubcf8\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uac00\uc838\uc628\ub2e4.<\/p>\n\n\n\n
git fetch upstream\n<\/code><\/pre>\n\n\n\n
\uadf8\ub9ac\uace0 \ucd5c\uc2e0 \uc6d0\ubcf8 Branch\ub97c \uae30\uc900\uc73c\ub85c \ub0b4 main<\/code>\uc744 \uc5c5\ub370\uc774\ud2b8\ud55c\ub2e4.<\/p>\n\n\n\n
git switch main\ngit merge upstream\/main\n<\/code><\/pre>\n\n\n\n
\ub610\ub294 \ud504\ub85c\uc81d\ud2b8 \uc815\ucc45\uc5d0 \ub530\ub77c Rebase\ub97c \uc0ac\uc6a9\ud560 \uc218\ub3c4 \uc788\ub2e4.<\/p>\n\n\n\n
\uadf8\ub2e4\uc74c \ub0b4 Fork\uc5d0 Push\ud55c\ub2e4.<\/p>\n\n\n\n
git push origin main\n<\/code><\/pre>\n\n\n\n
\uc804\uccb4\uc801\uc778 \ud750\ub984\uc740 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n\n
Original Repository -> fetch -> Local Repository -> merge \/ rebase -> Local main -> push -> My Fork\n<\/code><\/pre>\n\n\n\n
\n\n\n\n
Fork\uc5d0\uc11c Feature Branch\ub97c \ub9cc\ub4dc\ub294 \uc774\uc720<\/h2>\n\n\n\n
Fork\ud588\ub2e4\uace0 main<\/code>\uc5d0\uc11c \uc9c1\uc811 \uc791\uc5c5\ud558\ub294 \uac83\uc740 \uc88b\uc9c0 \uc54a\ub2e4.<\/p>\n\n\n\n
My Fork -> main \/ feature\/login \/ fix\/crash \/ feature\/inventory\n<\/code><\/pre>\n\n\n\n
\uac01 \uc791\uc5c5\uc744 \ubcc4\ub3c4\uc758 Branch\ub85c \ubd84\ub9ac\ud55c\ub2e4.<\/p>\n\n\n\n
\uadf8\ub9ac\uace0 \ud574\ub2f9 Branch\ub97c \ub0b4 Fork\uc5d0 Push\ud55c\ub2e4.<\/p>\n\n\n\n
git push origin feature\/login\n<\/code><\/pre>\n\n\n\n
\uc774\ud6c4 \uc6d0\ubcf8 Repository\uc758 main<\/code>\uc744 \ub300\uc0c1\uc73c\ub85c PR\uc744 \uc0dd\uc131\ud55c\ub2e4.<\/p>\n\n\n\n
My Fork -> feature\/login -> Pull Request -> Original Repository -> main\n<\/code><\/pre>\n\n\n\n
\n\n\n\n
\uc77c\ubc18\uc801\uc778 \ud300 \uac1c\ubc1c Workflow<\/h2>\n\n\n\n
\ud68c\uc0ac\uc5d0\uc11c \uc9c1\uc811 \uad8c\ud55c\uc744 \uac00\uc9c4 Repository\uc5d0 \ucc38\uc5ec\ud558\ub294 \uacbd\uc6b0\ub77c\uba74 Fork\uac00 \ud544\uc694\ud558\uc9c0 \uc54a\uc744 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ubcf4\ud1b5 \ub2e4\uc74c\uacfc \uac19\uc740 \uad6c\uc870\ub97c \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
Company Repository -> Clone -> Local Repository -> main \ucd5c\uc2e0\ud654 -> Feature Branch -> \uac1c\ubc1c -> Commit -> Push -> Pull Request -> Code Review -> \uc218\uc815 \ubc18\uc601 -> \uc2b9\uc778 -> Merge -> main\n<\/code><\/pre>\n\n\n\n
\uc774\ud6c4 \ub2e4\uc2dc \ucd5c\uc2e0 main<\/code>\uc744 \uac00\uc838\uc624\uace0 \uc0c8\ub85c\uc6b4 Branch\uc5d0\uc11c \ub2e4\uc74c \uc791\uc5c5\uc744 \uc2dc\uc791\ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
\uc791\uc5c5 \uc2dc\uc791 \uc804\uc5d0 main\uc744 \ucd5c\uc2e0\ud654\ud558\ub294 \uc774\uc720<\/h2>\n\n\n\n
\ub2e4\ub978 \uac1c\ubc1c\uc790\uac00 \uc774\ubbf8 main<\/code>\uc5d0 \ucf54\ub4dc\ub97c Merge\ud588\uc744 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ub0b4 Branch\uac00 \uc624\ub798\ub41c main<\/code>\uc5d0\uc11c \ub9cc\ub4e4\uc5b4\uc84c\ub2e4\uba74 \ub098\uc911\uc5d0 Merge\ud560 \ub54c Conflict\uac00 \ubc1c\uc0dd\ud560 \uac00\ub2a5\uc131\uc774 \ub192\uc544\uc9c4\ub2e4.<\/p>\n\n\n\n
\uadf8\ub798\uc11c \uc0c8\ub85c\uc6b4 \uc791\uc5c5\uc744 \uc2dc\uc791\ud560 \ub54c\ub294 \ubcf4\ud1b5<\/p>\n\n\n\n
git switch main\ngit pull origin main\ngit switch -c feature\/new-feature\n<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ucd5c\uc2e0 \uc0c1\ud0dc\uc5d0\uc11c Branch\ub97c \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
\uc791\uc5c5\uc774 \uc624\ub798 \uac78\ub9b0\ub2e4\uba74 \uc791\uc5c5 \uc911\uac04\uc5d0\ub3c4 \ucd5c\uc2e0 main<\/code>\uc744 \ubc18\uc601\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
main -> A -> B -> C -> D\nfeature -> A -> B -> C -> E -> F\n<\/code><\/pre>\n\n\n\n
\ucd5c\uc2e0 main<\/code>\uc758 D<\/code>\ub97c Feature Branch\uc5d0 \ubc18\uc601\ud574\uc11c<\/p>\n\n\n\n
main -> A -> B -> C -> D\nfeature -> A -> B -> C -> D -> E -> F\n<\/code><\/pre>\n\n\n\n
\uac19\uc740 \ucd5c\uc2e0 \uae30\uc900\uc73c\ub85c \uc791\uc5c5\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ud300\uc758 \uc815\ucc45\uc5d0 \ub530\ub77c Merge \ub610\ub294 Rebase\ub97c \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Conflict\uac00 \ubc1c\uc0dd\ud588\uc744 \ub54c<\/h2>\n\n\n\n
Conflict\ub294 \ud611\uc5c5\uc5d0\uc11c \ud53c\ud558\uae30 \uc5b4\ub824\uc6b4 \ubb38\uc81c\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
main -> A -> B -> C\nfeature -> A -> B -> D\n<\/code><\/pre>\n\n\n\n
\uc5d0\uc11c \uac19\uc740 \ud30c\uc77c\uc758 \uac19\uc740 \ubd80\ubd84\uc744 \uc218\uc815\ud588\ub2e4\uba74 Merge \uacfc\uc815\uc5d0\uc11c \ucda9\ub3cc\uc774 \ubc1c\uc0dd\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Git\uc740 \ub2e4\uc74c\ucc98\ub7fc \ucda9\ub3cc \uc704\uce58\ub97c \ud45c\uc2dc\ud55c\ub2e4.<\/p>\n\n\n\n
<<<<<<< HEAD\nmain\uc758 \ucf54\ub4dc\n=======\nfeature\uc758 \ucf54\ub4dc\n>>>>>>> feature\n<\/code><\/pre>\n\n\n\n
\uac1c\ubc1c\uc790\ub294 \uc2e4\uc81c \uc694\uad6c\uc0ac\ud56d\uc744 \uae30\uc900\uc73c\ub85c \uc5b4\ub5a4 \ucf54\ub4dc\ub97c \ub0a8\uae38\uc9c0 \uacb0\uc815\ud55c\ub2e4.<\/p>\n\n\n\n
\uc218\uc815\ud55c \ub4a4<\/p>\n\n\n\n
git add .\ngit commit\n<\/code><\/pre>\n\n\n\n
\ub610\ub294 Rebase \uc911\uc774\ub77c\uba74<\/p>\n\n\n\n
git add .\ngit rebase --continue\n<\/code><\/pre>\n\n\n\n
\uac19\uc740 \ubc29\uc2dd\uc73c\ub85c Conflict \ud574\uacb0\uc744 \uc644\ub8cc\ud55c\ub2e4.<\/p>\n\n\n\n
Conflict\ub97c \ubb34\uc870\uac74 \ud53c\ud574\uc57c \ud558\ub294 \ubb38\uc81c\uac00 \uc544\ub2c8\ub77c \ucda9\ub3cc\uc774 \ubc1c\uc0dd\ud588\uc744 \ub54c \uc5b4\ub5a4 \ucf54\ub4dc\uac00 \uc62c\ubc14\ub978\uc9c0 \ud310\ub2e8\ud558\ub294 \uac83\uc774 \uac1c\ubc1c\uc790\uc758 \uc5ed\ud560<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uc5d0\uc11c \uc790\uc8fc \ubc1c\uc0dd\ud558\ub294 \uc2e4\uc218<\/h2>\n\n\n\n
main\uc5d0\uc11c \uc9c1\uc811 \uc791\uc5c5<\/h3>\n\n\n\n
main -> \ucf54\ub4dc \uc218\uc815 -> Commit\n<\/code><\/pre>\n\n\n\n
\ud300 \uac1c\ubc1c\uc5d0\uc11c\ub294 \uc791\uc5c5 Branch\ub97c \ub9cc\ub4dc\ub294 \uac83\uc774 \uc548\uc804\ud558\ub2e4.<\/p>\n\n\n\n
\uc758\ubbf8 \uc5c6\ub294 Commit<\/h3>\n\n\n\n
fix \/ update \/ test \/ final\n<\/code><\/pre>\n\n\n\n
\ub098\uc911\uc5d0 history\ub97c \uc774\ud574\ud558\uae30 \uc5b4\ub835\ub2e4.<\/p>\n\n\n\n
\ub108\ubb34 \ud070 PR<\/h3>\n\n\n\n
\ud558\ub098\uc758 PR\uc5d0<\/p>\n\n\n\n
\uae30\ub2a5 \ucd94\uac00 \/ \ub9ac\ud329\ud130\ub9c1 \/ \ud30c\uc77c \uad6c\uc870 \ubcc0\uacbd \/ \ucf54\ub4dc \uc2a4\ud0c0\uc77c \uc218\uc815 \/ \ubc84\uadf8 \uc218\uc815\n<\/code><\/pre>\n\n\n\n
\uc744 \uc804\ubd80 \ub123\uc73c\uba74 Review\ud558\uae30 \uc5b4\ub835\ub2e4.<\/p>\n\n\n\n
\uac00\ub2a5\ud558\uba74 \ud558\ub098\uc758 PR\uc774 \ud558\ub098\uc758 \uba85\ud655\ud55c \ubaa9\uc801\uc744 \uac16\ub3c4\ub85d \ub9cc\ub4dc\ub294 \ud3b8\uc774 \uc88b\ub2e4.<\/p>\n\n\n\n
PR\uc744 \ub9cc\ub4e0 \ub4a4 \ucd94\uac00 \uc791\uc5c5\uc744 \ubcc4\ub3c4\ub85c \ub9cc\ub4e4\uae30<\/h3>\n\n\n\n
\uc774\ubbf8 PR\uc774 \uc5f4\ub824 \uc788\ub2e4\uba74 \uac19\uc740 Branch\uc5d0 Commit\ud558\uace0 Push\ud558\uba74 \uae30\uc874 PR\uc5d0 \uc790\ub3d9\uc73c\ub85c \ubc18\uc601\ub41c\ub2e4.<\/p>\n\n\n\n
\uc624\ub798\ub41c Branch\uc5d0\uc11c \uacc4\uc18d \uc791\uc5c5<\/h3>\n\n\n\n
\ucd5c\uc2e0 main<\/code>\uacfc \ucc28\uc774\uac00 \ub108\ubb34 \ucee4\uc9c0\uba74 \ub098\uc911\uc5d0 Conflict \ud574\uacb0 \ube44\uc6a9\uc774 \uc99d\uac00\ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git \uc2e4\ubb34 Workflow \ud55c \ubc88\uc5d0 \ubcf4\uae30<\/h2>\n\n\n\n
\uc77c\ubc18\uc801\uc778 \ud300 \uac1c\ubc1c<\/h3>\n\n\n\n
Repository -> Clone -> main -> \ucd5c\uc2e0\ud654 -> Feature Branch -> \ucf54\ub4dc \uc791\uc131 -> Test -> Commit -> Push -> Pull Request -> Code Review -> \uc2b9\uc778 -> Merge -> Branch \uc0ad\uc81c -> main \ucd5c\uc2e0\ud654\n<\/code><\/pre>\n\n\n\n
Review\uc5d0\uc11c \uc218\uc815 \uc694\uccad\uc774 \ubc1c\uc0dd\ud558\uba74 \ub2e4\uc74c \ud750\ub984\uc73c\ub85c \ub3cc\uc544\uac04\ub2e4.<\/p>\n\n\n\n
Code Review -> \uc218\uc815 \uc694\uccad -> Commit -> Push -> Pull Request\n<\/code><\/pre>\n\n\n\n
\n\n\n\n
Fork \uae30\ubc18 Workflow<\/h2>\n\n\n\n
Original Repository -> Fork -> My Repository -> Clone -> Local Repository -> Feature Branch -> \uac1c\ubc1c -> Commit -> Push -> My Repository -> Pull Request -> Original Repository -> Code Review -> Merge\n<\/code><\/pre>\n\n\n\n
\uc6d0\ubcf8 Repository\uac00 \ubcc0\uacbd\ub418\uba74 \ub2e4\uc74c \ud750\ub984\uc73c\ub85c \ub3d9\uae30\ud654\ud55c\ub2e4.<\/p>\n\n\n\n
Original Repository -> upstream fetch -> Local Repository -> merge \/ rebase -> Local main -> origin push -> My Repository\n<\/code><\/pre>\n\n\n\n
\n\n\n\n
Git\uc744 \uc2e4\ubb34\uc5d0\uc11c \uc5b4\ub5bb\uac8c \uc774\ud574\ud558\uba74 \ub418\ub294\uac00<\/h2>\n\n\n\n
Git \uba85\ub839\uc5b4 \uc790\uccb4\ub294 \ub9ce\uc9c0\ub9cc \uc2e4\ubb34\uc5d0\uc11c \ubc18\ubcf5\ud558\ub294 \uc791\uc5c5\uc740 \uc0dd\uac01\ubcf4\ub2e4 \ub2e8\uc21c\ud558\ub2e4.<\/p>\n\n\n\n
\ucd5c\uc2e0 \ucf54\ub4dc \uac00\uc838\uc624\uae30 -> Branch \ub9cc\ub4e4\uae30 -> \uac1c\ubc1c -> Commit -> Push -> PR -> Review -> \uc218\uc815 -> Merge -> \ucd5c\uc2e0\ud654\n<\/code><\/pre>\n\n\n\n
Fork\uac00 \ud544\uc694\ud55c \ud504\ub85c\uc81d\ud2b8\ub77c\uba74 \uc55e\uc5d0<\/p>\n\n\n\n
Fork -> Clone\n<\/code><\/pre>\n\n\n\n
\uc774 \ucd94\uac00\ub41c\ub2e4.<\/p>\n\n\n\n
Git\uc744 \uc81c\ub300\ub85c \uc0ac\uc6a9\ud55c\ub2e4\ub294 \uac83\uc740 \ubaa8\ub4e0 \uba85\ub839\uc5b4\ub97c \uc678\uc6b0\ub294 \uac83\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\ud604\uc7ac \ub0b4\uac00<\/p>\n\n\n\n
\uc5b4\ub5a4 Repository\uc5d0 \uc788\ub294\uc9c0 \/ \uc5b4\ub5a4 Branch\uc5d0\uc11c \uc791\uc5c5\ud558\ub294\uc9c0 \/ \ub0b4 \ubcc0\uacbd\uc0ac\ud56d\uc774 \uc5b4\ub514\uae4c\uc9c0 Commit\ub410\ub294\uc9c0 \/ Remote\uc640 \uc5bc\ub9c8\ub098 \ucc28\uc774\uac00 \ub098\ub294\uc9c0 \/ \uc5b4\ub5a4 Branch\uc5d0 Merge\ud558\ub824\ub294\uc9c0\n<\/code><\/pre>\n\n\n\n
\ub97c \ud56d\uc0c1 \uc54c\uace0 \uc788\ub294 \uac83\uc774 \ub354 \uc911\uc694\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
\uc815\ub9ac<\/h2>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c Git\uc740 \ub2e8\uc21c\ud55c \ubc84\uc804 \uad00\ub9ac \ub3c4\uad6c\uac00 \uc544\ub2c8\ub77c \ud611\uc5c5 Workflow\ub97c \uad6c\uc131\ud558\ub294 \uae30\ubc18<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\uac00\uc7a5 \uae30\ubcf8\uc801\uc778 \uad6c\uc870\ub294 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n\n
Repository -> Branch -> Commit -> Push -> Pull Request -> Review -> Merge\n<\/code><\/pre>\n\n\n\n
Fork\ub97c \uc0ac\uc6a9\ud558\ub294 \ud504\ub85c\uc81d\ud2b8\ub77c\uba74<\/p>\n\n\n\n
Original Repository -> Fork -> Clone -> Branch -> Commit -> Push -> Pull Request -> Review -> Merge\n<\/code><\/pre>\n\n\n\n
\uac00 \ub41c\ub2e4.<\/p>\n\n\n\n
\uadf8\ub9ac\uace0 PR\uc774 Merge\ub41c \ub4a4\uc5d0\ub294 \ub2e4\uc2dc \ucd5c\uc2e0 main<\/code>\uc744 \uac00\uc838\uc640 \ub2e4\uc74c \uc791\uc5c5\uc744 \uc2dc\uc791\ud55c\ub2e4.<\/p>\n\n\n\n
Merge -> main \ucd5c\uc2e0\ud654 -> \uc0c8\ub85c\uc6b4 Branch -> \uc0c8\ub85c\uc6b4 \uc791\uc5c5\n<\/code><\/pre>\n\n\n\n
Git\uc5d0\uc11c \uac00\uc7a5 \uc911\uc694\ud55c \uac83\uc740 git add<\/code>\ub098 git commit<\/code> \uac19\uc740 \uba85\ub839\uc5b4\ub97c \ub9ce\uc774 \uc544\ub294 \uac83\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\ub0b4 \uc791\uc5c5\uc744 \ub2e4\ub978 \uc791\uc5c5\uacfc \ubd84\ub9ac\ud558\uace0, \ubcc0\uacbd\uc0ac\ud56d\uc744 \uc758\ubbf8 \uc788\ub294 \ub2e8\uc704\ub85c \uae30\ub85d\ud558\uace0, \ub2e4\ub978 \uac1c\ubc1c\uc790\uc758 \uac80\ud1a0\ub97c \uac70\uccd0 \uc548\uc804\ud558\uac8c \ud558\ub098\uc758 \ucf54\ub4dc\ubca0\uc774\uc2a4\ub85c \ud1b5\ud569\ud558\ub294 \uac83.<\/strong><\/p>\n\n\n\n
\uc2e4\ubb34\uc5d0\uc11c Git\uc744 \uc0ac\uc6a9\ud558\ub294 \uc774\uc720\ub294 \uacb0\uad6d \uc774 Workflow\ub97c \uc548\uc815\uc801\uc73c\ub85c \uc720\uc9c0\ud558\uae30 \uc704\ud574\uc11c\ub2e4.<\/p>\n","protected":false},"excerpt":{"rendered":"
Git\uc740 \uc18c\uc2a4 \ucf54\ub4dc\uc758 \ubcc0\uacbd \uc774\ub825\uc744 \uad00\ub9ac\ud558\ub294 \ubd84\uc0b0 \ubc84\uc804 \uad00\ub9ac \uc2dc\uc2a4\ud15c\uc774\ub2e4. \uac1c\uc778 \ud504\ub85c\uc81d\ud2b8\uc5d0\uc11c\ub294 \ucf54\ub4dc\ub97c \uc548\uc804\ud558\uac8c \uc800\uc7a5\ud558\uace0 \uc774\uc804 \uc0c1\ud0dc\ub85c \ub418\ub3cc\ub9ac\ub294 \uc6a9\ub3c4\ub85c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc9c0\ub9cc, \ud300 \uac1c\ubc1c\uc5d0\uc11c\ub294 \uc5ed\ud560\uc774 \uc870\uae08 \ub354 \ud06c\ub2e4. \uc5ec\ub7ec \uac1c\ubc1c\uc790\uac00 \uac19\uc740 \ud504\ub85c\uc81d\ud2b8\ub97c \ub3d9\uc2dc\uc5d0 \uc218\uc815\ud558\uace0, \uac01\uc790\uc758 \uc791\uc5c5\uc744 \ubd84\ub9ac\ud558\uace0, \ubcc0\uacbd\uc0ac\ud56d\uc744 \uac80\ud1a0\ud55c \ub2e4\uc74c \ud558\ub098\uc758 \ucf54\ub4dc\ubca0\uc774\uc2a4\ub85c \ud569\uce58\ub294 \uacfc\uc815 \uc804\uccb4\ub97c \uad00\ub9ac\ud55c\ub2e4. \uc2e4\ubb34\uc5d0\uc11c Git\uc744 \uc0ac\uc6a9\ud55c\ub2e4\uba74 \ub2e8\uc21c\ud788 add, commit, push \uba85\ub839\uc5b4\ub97c \uc544\ub294 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[52],"tags":[],"class_list":["post-1722","post","type-post","status-publish","format-standard","hentry","category-tools"],"_links":{"self":[{"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts\/1722","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1722"}],"version-history":[{"count":3,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts\/1722\/revisions"}],"predecessor-version":[{"id":2001,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts\/1722\/revisions\/2001"}],"wp:attachment":[{"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1722"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1722"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1722"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}