{"id":1720,"date":"2026-06-24T15:53:35","date_gmt":"2026-06-24T15:53:35","guid":{"rendered":"https:\/\/wayhope.kro.kr\/?p=1720"},"modified":"2026-08-31T07:32:49","modified_gmt":"2026-08-31T07:32:49","slug":"git-%ed%95%b5%ec%8b%ac-%ec%a0%95%eb%a6%ac","status":"publish","type":"post","link":"https:\/\/wayhope.kro.kr\/?p=1720","title":{"rendered":"Git \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<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n

\ud30c\uc77c\uc744 \uc218\uc815\ud558\uace0 \uc800\uc7a5\ud558\ub294 \uac83\ub9cc\uc73c\ub85c\ub294 \uc774\uc804 \uc0c1\ud0dc\ub97c \uc548\uc804\ud558\uac8c \ubcf5\uad6c\ud558\uae30 \uc5b4\ub835\ub2e4. \uc5ec\ub7ec \uae30\ub2a5\uc744 \ub3d9\uc2dc\uc5d0 \uac1c\ubc1c\ud558\uac70\ub098 \uc5ec\ub7ec \uac1c\ubc1c\uc790\uac00 \uac19\uc740 \ucf54\ub4dc\ub97c \uc218\uc815\ud558\uae30 \uc2dc\uc791\ud558\uba74 \uc5b4\ub5a4 \ubcc0\uacbd\uc774 \uc5b8\uc81c \ubc1c\uc0dd\ud588\uace0, \ub204\uac00 \ubb34\uc5c7\uc744 \uc218\uc815\ud588\uc73c\uba70, \ud2b9\uc815 \ubcc0\uacbd\uc744 \ub418\ub3cc\ub9ac\ub824\uba74 \uc5b4\ub514\uae4c\uc9c0 \ub418\ub3cc\ub824\uc57c \ud558\ub294\uc9c0 \uad00\ub9ac\ud560 \ud544\uc694\uac00 \uc0dd\uae34\ub2e4.<\/p>\n\n\n\n

Git\uc740 \uc774 \ubb38\uc81c\ub97c \ubcc0\uacbd \uc774\ub825\uacfc \uc791\uc5c5 \uc0c1\ud0dc\ub97c \uad00\ub9ac\ud558\ub294 \uac83<\/strong>\uc73c\ub85c \ud574\uacb0\ud55c\ub2e4.<\/p>\n\n\n\n

Git\uc744 \uc774\ud574\ud560 \ub54c \uc911\uc694\ud55c \uac83\uc740 commit<\/code>, branch<\/code>, merge<\/code>, rebase<\/code>, remote<\/code> \uac19\uc740 \uba85\ub839\uc5b4\ub97c \uc678\uc6b0\ub294 \uac83\uc774 \uc544\ub2c8\ub2e4. Git\uc774 \uc5b4\ub5a4 \uc0c1\ud0dc\ub97c \uad00\ub9ac\ud558\uace0, \ubcc0\uacbd\uc0ac\ud56d\uc774 \uc5b4\ub5a4 \ud750\ub984\uc73c\ub85c \uc800\uc7a5\ub418\ub294\uc9c0\ub97c \uc774\ud574\ud558\ub294 \uac83\uc774 \uba3c\uc800\ub2e4.<\/p>\n\n\n\n

\n\n\n\n

Git\uc758 \uae30\ubcf8 \uad6c\uc870<\/h2>\n\n\n\n

Git\uc758 \uae30\ubcf8\uc801\uc778 \uc791\uc5c5 \ud750\ub984\uc740 \ub2e4\uc74c\uacfc \uac19\ub2e4.<\/p>\n\n\n\n

Working Directory -> git add -> Staging Area -> git commit -> Repository<\/code><\/pre>\n\n\n\n
\uac1c\ubc1c\uc790\uac00 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 Working Directory\uc5d0 \ubcc0\uacbd\uc0ac\ud56d\uc774 \uc0dd\uae34\ub2e4.<\/p>\n\n\n\n
git add<\/code>\ub97c \uc2e4\ud589\ud558\uba74 \uc6d0\ud558\ub294 \ubcc0\uacbd\uc0ac\ud56d\uc744 Staging Area\uc5d0 \uc62c\ub9b0\ub2e4.<\/p>\n\n\n\n
\uadf8\ub9ac\uace0 git commit<\/code>\uc744 \uc2e4\ud589\ud558\uba74 Staging Area\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc774 \ud558\ub098\uc758 Commit\uc73c\ub85c Repository\uc5d0 \uae30\ub85d\ub41c\ub2e4.<\/p>\n\n\n\n
\uc774 \uad6c\uc870\ub97c \uc774\ud574\ud558\uba74 Git \uba85\ub839\uc5b4 \ub300\ubd80\ubd84\uc774 \uc5b4\ub514\uc5d0 \uc601\ud5a5\uc744 \uc8fc\ub294\uc9c0 \uc774\ud574\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Working Directory<\/h2>\n\n\n\n
\ud604\uc7ac \uac1c\ubc1c\uc790\uac00 \uc2e4\uc81c\ub85c \uc791\uc5c5\ud558\uace0 \uc788\ub294 \ud30c\uc77c \uc0c1\ud0dc\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
Player.cpp \/ Player.h \/ Inventory.cpp<\/code><\/pre>\n\n\n\n
\ub97c \uc218\uc815\ud588\ub2e4\uba74 \uc544\uc9c1 Commit\ud558\uc9c0 \uc54a\uc740 \ubcc0\uacbd\uc0ac\ud56d\uc740 Working Directory\uc5d0 \uc874\uc7ac\ud55c\ub2e4.<\/p>\n\n\n\n
Git\uc740 \uc774 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uae30\uc874 Commit\uacfc \ube44\uad50\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
git status<\/code><\/pre>\n\n\n\n
\ub97c \uc0ac\uc6a9\ud558\uba74 \ud604\uc7ac \uc791\uc5c5 \uc0c1\ud0dc\ub97c \ud655\uc778\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Staging Area<\/h2>\n\n\n\n
Staging Area\ub294 \ub2e4\uc74c Commit\uc5d0 \ud3ec\ud568\ud560 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uc784\uc2dc\ub85c \uc120\ud0dd\ud558\ub294 \uc601\uc5ed\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 \ub2e4\uc74c\uacfc \uac19\uc774 \uc5ec\ub7ec \ud30c\uc77c\uc744 \uc218\uc815\ud588\ub2e4\uace0 \ud558\uc790.<\/p>\n\n\n\n
Player.cpp \/ Player.h \/ Inventory.cpp \/ README.md<\/code><\/pre>\n\n\n\n
\uadf8\uc911 Player \uad00\ub828 \ubcc0\uacbd\ub9cc Commit\ud558\uace0 \uc2f6\ub2e4\uba74<\/p>\n\n\n\n
git add Player.cpp Player.h<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ud544\uc694\ud55c \ud30c\uc77c\ub9cc Stage\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc774\ud6c4<\/p>\n\n\n\n
git commit -m \"Update player system\"<\/code><\/pre>\n\n\n\n
\uc744 \uc2e4\ud589\ud558\uba74 Stage\ub41c \ubcc0\uacbd\uc0ac\ud56d\ub9cc Commit\ub41c\ub2e4.<\/p>\n\n\n\n
\ub530\ub77c\uc11c Commit\uc740 \ub2e8\uc21c\ud788 “\ud604\uc7ac \ud3f4\ub354\uc758 \ubaa8\ub4e0 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uc800\uc7a5\ud558\ub294 \uac83”\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
Staging Area\uc5d0 \uc62c\ub824\ub193\uc740 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ud558\ub098\uc758 \uc5ed\uc0ac\uc801 \uc0c1\ud0dc\ub85c \uae30\ub85d\ud558\ub294 \uac83<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Commit<\/h2>\n\n\n\n
Commit\uc740 Git\uc5d0\uc11c \uac00\uc7a5 \uc911\uc694\ud55c \ub2e8\uc704\ub2e4.<\/p>\n\n\n\n
\ud558\ub098\uc758 Commit\uc5d0\ub294 \ud2b9\uc815 \uc2dc\uc810\uc758 \ud504\ub85c\uc81d\ud2b8 \uc0c1\ud0dc\uc640 \uadf8 \uc0c1\ud0dc\ub85c \ubcc0\uacbd\ub41c \ub0b4\uc6a9\uc744 \ub098\ud0c0\ub0b4\ub294 \uc815\ubcf4\uac00 \ub4e4\uc5b4 \uc788\ub2e4.<\/p>\n\n\n\n
Commit A -> Commit B -> Commit C<\/code><\/pre>\n\n\n\n
\uac1c\ubc1c\ud558\uba74\uc11c Commit\uc774 \uacc4\uc18d \uc313\uc774\uba74 \ud504\ub85c\uc81d\ud2b8\uc758 \ubcc0\uacbd \uc774\ub825\uc774 \ub41c\ub2e4.<\/p>\n\n\n\n
git log<\/code><\/pre>\n\n\n\n
\uc744 \uc0ac\uc6a9\ud558\uba74 Commit history\ub97c \ud655\uc778\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Commit\uc5d0\ub294 \uc77c\ubc18\uc801\uc73c\ub85c \ub2e4\uc74c\uacfc \uac19\uc740 \uc815\ubcf4\uac00 \uc874\uc7ac\ud55c\ub2e4.<\/p>\n\n\n\n
Commit -> \ubcc0\uacbd \ub0b4\uc6a9 \/ \uc791\uc131\uc790 \/ \uc2dc\uac04 \/ \uba54\uc2dc\uc9c0 \/ \ubd80\ubaa8 Commit<\/code><\/pre>\n\n\n\n
Git\uc740 \uc774 Commit\ub4e4\uc744 \uc5f0\uacb0\ud574\uc11c \ud504\ub85c\uc81d\ud2b8\uc758 \uc5ed\uc0ac\ub97c \uad6c\uc131\ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Commit\uc740 \uc800\uc7a5 \uc9c0\uc810\uc774\ub2e4<\/h2>\n\n\n\n
Commit\uc744 \ub2e8\uc21c\ud788 “\ud30c\uc77c \uc800\uc7a5”\uc774\ub77c\uace0 \uc0dd\uac01\ud558\uba74 Git\uc744 \uc798\ubabb \uc774\ud574\ud558\uac8c \ub41c\ub2e4.<\/p>\n\n\n\n
Commit\uc740 \uc758\ubbf8 \uc788\ub294 \ubcc0\uacbd \ub2e8\uc704<\/strong>\ub85c \ub9cc\ub4dc\ub294 \uac83\uc774 \uc88b\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
Commit 1 -> Player \uc774\ub3d9 \uc2dc\uc2a4\ud15c \ucd94\uac00\nCommit 2 -> Player \uacf5\uaca9 \uc2dc\uc2a4\ud15c \ucd94\uac00\nCommit 3 -> \uacf5\uaca9 \uc2dc\uc2a4\ud15c \ubc84\uadf8 \uc218\uc815<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ub9cc\ub4e4\uba74 \ubcc0\uacbd \uc774\ub825\uc744 \uc774\ud574\ud558\uae30 \uc27d\ub2e4.<\/p>\n\n\n\n
\ubc18\ub300\ub85c<\/p>\n\n\n\n
Commit 1 -> \uc774\uac83\uc800\uac83 \uc218\uc815<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ub9cc\ub4e4\uba74 \ub098\uc911\uc5d0 \ud2b9\uc815 \ubcc0\uacbd\uc744 \ucc3e\uac70\ub098 \ub418\ub3cc\ub9ac\uae30 \uc5b4\ub824\uc6cc\uc9c4\ub2e4.<\/p>\n\n\n\n
Git\uc744 \uc798 \uc0ac\uc6a9\ud558\ub294 \uac1c\ubc1c\uc790\ub294 Commit\uc744 \ub9ce\uc774 \ub9cc\ub4dc\ub294 \uc0ac\ub78c\uc774 \uc544\ub2c8\ub77c \uc758\ubbf8 \uc788\ub294 \ub2e8\uc704\ub85c \uc774\ub825\uc744 \ub9cc\ub4dc\ub294 \uc0ac\ub78c<\/strong>\uc5d0 \uac00\uae5d\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Branch<\/h2>\n\n\n\n
Branch\ub294 \ud2b9\uc815 Commit\uc744 \uae30\uc900\uc73c\ub85c \ub3c5\ub9bd\uc801\uc778 \uc791\uc5c5 \ud750\ub984\uc744 \ub9cc\ub4dc\ub294 \uae30\ub2a5\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
A -> B -> C<\/code><\/pre>\n\n\n\n
\ub77c\ub294 Commit history\uac00 \uc788\ub2e4\uace0 \ud558\uc790.<\/p>\n\n\n\n
\uc5ec\uae30\uc11c \uc0c8\ub85c\uc6b4 \uae30\ub2a5\uc744 \uac1c\ubc1c\ud558\uae30 \uc704\ud574 Branch\ub97c \ub9cc\ub4e4\uba74<\/p>\n\n\n\n
A -> B -> C -> D -> E -> F\n           \/ \n          Feature Branch<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ubcc4\ub3c4\uc758 \uc791\uc5c5 \ud750\ub984\uc744 \ub9cc\ub4e4 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc2e4\uc81c\ub85c\ub294 Branch\uac00 \ubcc4\ub3c4\uc758 \ud30c\uc77c \ubcf5\uc0ac\ubcf8\uc744 \ub9cc\ub4dc\ub294 \uac1c\ub150\uc774\ub77c\uae30\ubcf4\ub2e4 \ud2b9\uc815 Commit\uc744 \uac00\ub9ac\ud0a4\ub294 \ucc38\uc870<\/strong>\uc5d0 \uac00\uae5d\ub2e4.<\/p>\n\n\n\n
\uadf8\ub798\uc11c Branch\ub97c \ub9cc\ub4dc\ub294 \ube44\uc6a9\uc774 \ub9e4\uc6b0 \uc791\ub2e4.<\/p>\n\n\n\n
git branch feature\/inventory\ngit switch feature\/inventory<\/code><\/pre>\n\n\n\n
\ub610\ub294<\/p>\n\n\n\n
git switch -c feature\/inventory<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc0c8\ub85c\uc6b4 Branch\ub97c \ub9cc\ub4e4\uace0 \uc774\ub3d9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Branch\ub97c \uc0ac\uc6a9\ud558\ub294 \uc774\uc720<\/h2>\n\n\n\n
Branch\uc758 \ud575\uc2ec \ubaa9\uc801\uc740 \uc791\uc5c5\uc744 \uaca9\ub9ac\ud558\ub294 \uac83<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 \ud604\uc7ac main<\/code>\uc5d0\uc11c \uc548\uc815\uc801\uc778 \uac8c\uc784 \ubc84\uc804\uc744 \uc720\uc9c0\ud558\uace0 \uc788\ub2e4\uace0 \ud558\uc790.<\/p>\n\n\n\n
main -> A -> B -> C<\/code><\/pre>\n\n\n\n
\uc5ec\uae30\uc5d0\uc11c \uc0c8\ub85c\uc6b4 \uc778\ubca4\ud1a0\ub9ac \uae30\ub2a5\uc744 \uac1c\ubc1c\ud55c\ub2e4\uba74<\/p>\n\n\n\n
main -> A -> B -> C \/ feature\/inventory -> D -> E -> F<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ubcc4\ub3c4\uc758 Branch\uc5d0\uc11c \uc791\uc5c5\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uadf8\ub7ec\uba74 \uc778\ubca4\ud1a0\ub9ac \uac1c\ubc1c\uc774 \uc9c4\ud589\ub418\ub294 \ub3d9\uc548 \uae30\uc874 main<\/code>\uc758 \uc0c1\ud0dc\ub97c \uc720\uc9c0\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc774\uac83\uc774 Git Branch\uc758 \ud575\uc2ec\uc801\uc778 \uc5ed\ud560\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Merge<\/h2>\n\n\n\n
\uc791\uc5c5\uc774 \ub05d\ub09c Branch\ub97c \ub2e4\ub978 Branch\uc5d0 \ud569\uce58\ub294 \uc791\uc5c5\uc774 Merge\ub2e4.<\/p>\n\n\n\n
A -> B -> C -> M \/ D -> E<\/code><\/pre>\n\n\n\n
\uac1c\ub150\uc801\uc73c\ub85c\ub294 Feature Branch\uc5d0\uc11c \uc791\uc5c5\ud55c \ub0b4\uc6a9\uc744 main<\/code>\uc5d0 \ud569\uce58\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n
git switch main\ngit merge feature\/inventory<\/code><\/pre>\n\n\n\n
Merge\uc758 \uc7a5\uc810\uc740 \uae30\uc874 Branch\uc758 Commit history\ub97c \uc720\uc9c0\ud558\uba74\uc11c \ub450 \uc791\uc5c5 \ud750\ub984\uc744 \uacb0\ud569\ud560 \uc218 \uc788\ub2e4\ub294 \uc810\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Merge Conflict<\/h2>\n\n\n\n
\ub450 Branch\uc5d0\uc11c \uac19\uc740 \ucf54\ub4dc\ub97c \uc11c\ub85c \ub2e4\ub974\uac8c \uc218\uc815\ud558\uba74 Git\uc774 \uc5b4\ub5a4 \ubcc0\uacbd\uc744 \uc120\ud0dd\ud574\uc57c \ud560\uc9c0 \ud310\ub2e8\ud558\uc9c0 \ubabb\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
player->Move(speed);<\/code><\/pre>\n\n\n\n
\ub97c \ud55c Branch\uc5d0\uc11c\ub294<\/p>\n\n\n\n
player->Move(moveSpeed);<\/code><\/pre>\n\n\n\n
\ub85c \ubcc0\uacbd\ud558\uace0 \ub2e4\ub978 Branch\uc5d0\uc11c\ub294<\/p>\n\n\n\n
player->Move(currentSpeed);<\/code><\/pre>\n\n\n\n
\ub85c \ubcc0\uacbd\ud588\ub2e4\uace0 \ud558\uc790.<\/p>\n\n\n\n
Git \uc785\uc7a5\uc5d0\uc11c\ub294 \ub458 \uc911 \uc5b4\ub290 \uac83\uc774 \uc62c\ubc14\ub978\uc9c0 \uc54c \uc218 \uc5c6\ub2e4.<\/p>\n\n\n\n
\uc774\ub7f0 \uc0c1\ud669\uc774 Conflict\ub2e4.<\/p>\n\n\n\n
Branch A -> \uac19\uc740 \ubd80\ubd84 \uc218\uc815 <- Branch B<\/code><\/pre>\n\n\n\n
Conflict\uac00 \ubc1c\uc0dd\ud558\uba74 \uac1c\ubc1c\uc790\uac00 \uc9c1\uc811 \uc5b4\ub5a4 \ucf54\ub4dc\ub97c \ub0a8\uae38\uc9c0 \uacb0\uc815\ud574\uc57c \ud55c\ub2e4.<\/p>\n\n\n\n
Git\uc740 \ucf54\ub4dc\uc758 \uc758\ubbf8\ub97c \ud310\ub2e8\ud558\ub294 \uc2dc\uc2a4\ud15c\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\ubcc0\uacbd \uc774\ub825\uc744 \uad00\ub9ac\ud560 \uc218\ub294 \uc788\uc9c0\ub9cc, \ube44\uc988\ub2c8\uc2a4 \ub85c\uc9c1\uc758 \uc815\ub2f5\uc744 \ud310\ub2e8\ud558\uc9c0\ub294 \uc54a\ub294\ub2e4.<\/strong><\/p>\n\n\n\n
\n\n\n\n
Rebase<\/h2>\n\n\n\n
Rebase\ub3c4 Branch\uc758 \ubcc0\uacbd \uc774\ub825\uc744 \uc815\ub9ac\ud558\ub294 \ub370 \uc0ac\uc6a9\ub41c\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
A -> B -> C \/ D -> E<\/code><\/pre>\n\n\n\n
\ub77c\ub294 \uc0c1\ud669\uc5d0\uc11c Feature Branch\uc758 \uae30\uc900\uc744 \ucd5c\uc2e0 C<\/code>\ub85c \uc62e\uae38 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
A -> B -> C -> D' -> E'<\/code><\/pre>\n\n\n\n
Feature Branch\uc758 Commit\uc744 \uc0c8\ub85c\uc6b4 \uae30\uc900 \uc704\uc5d0 \ub2e4\uc2dc \uc801\uc6a9\ud558\ub294 \ubc29\uc2dd\uc774\ub2e4.<\/p>\n\n\n\n
\uadf8\ub798\uc11c Commit\uc758 Hash\ub3c4 \uc0c8\ub85c \ub9cc\ub4e4\uc5b4\uc9c4\ub2e4.<\/p>\n\n\n\n
D -> D'\nE -> E'<\/code><\/pre>\n\n\n\n
Rebase\uc758 \uc7a5\uc810\uc740 Commit history\ub97c \uc120\ud615\uc801\uc73c\ub85c \uc815\ub9ac\ud558\uae30 \uc88b\ub2e4\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n
\ub2e4\ub9cc Rebase\ub294 \uae30\uc874 Commit\uc744 \uc7ac\uc791\uc131\ud55c\ub2e4.<\/p>\n\n\n\n
\ub530\ub77c\uc11c \uc774\ubbf8 \uc5ec\ub7ec \uc0ac\ub78c\uc774 \uacf5\uc720\ud558\uace0 \uc788\ub294 Branch\uc5d0\uc11c \ubb34\ubd84\ubcc4\ud558\uac8c Rebase\ud558\uba74 \ubb38\uc81c\uac00 \ubc1c\uc0dd\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Merge\uc640 Rebase<\/h2>\n\n\n\n
\ub458 \ub2e4 Branch\ub97c \ud1b5\ud569\ud558\ub294 \ub370 \uc0ac\uc6a9\ud560 \uc218 \uc788\uc9c0\ub9cc \ubaa9\uc801\uacfc \uacb0\uacfc\uac00 \ub2e4\ub974\ub2e4.<\/p>\n\n\n\n
Merge -> A -> B -> C -> M \/ D -> E\nRebase -> A -> B -> C -> D' -> E'<\/code><\/pre>\n\n\n\n
Merge\ub294 \uc2e4\uc81c Branch\uac00 \uac08\ub77c\uc9c0\uace0 \ud569\uccd0\uc9c4 \uc774\ub825\uc744 \uadf8\ub300\ub85c \ub0a8\uae34\ub2e4.<\/p>\n\n\n\n
Rebase\ub294 Feature Branch\uc758 Commit\uc744 \ucd5c\uc2e0 \uae30\uc900 \uc704\uc5d0 \ub2e4\uc2dc \ubc30\uce58\ud574\uc11c history\ub97c \uc120\ud615\uc801\uc73c\ub85c \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
\uac1c\uc778\uc801\uc73c\ub85c Git\uc744 \uc0ac\uc6a9\ud560 \ub54c\ub294 \ub2e4\uc74c \uc815\ub3c4\ub85c \uad6c\ubd84\ud558\uba74 \ucda9\ubd84\ud558\ub2e4.<\/p>\n\n\n\n
Merge -> \uc2e4\uc81c \uc791\uc5c5 \uc774\ub825\uc744 \ubcf4\uc874\ud558\uace0 \uc2f6\uc744 \ub54c\nRebase -> Commit history\ub97c \uc815\ub9ac\ud558\uace0 \uc2f6\uc744 \ub54c<\/code><\/pre>\n\n\n\n
\n\n\n\n
HEAD<\/h2>\n\n\n\n
Git\uc744 \uc774\ud574\ud558\ub824\uba74 HEAD<\/code>\ub3c4 \uc54c\uc544\uc57c \ud55c\ub2e4.<\/p>\n\n\n\n
HEAD\ub294 \ud604\uc7ac \ub0b4\uac00 \ubc14\ub77c\ubcf4\uace0 \uc788\ub294 Commit\uc744 \ub098\ud0c0\ub0b4\ub294 \ucc38\uc870\ub2e4.<\/p>\n\n\n\n
\uc77c\ubc18\uc801\uc73c\ub85c \ud604\uc7ac Branch\ub97c \uac00\ub9ac\ud0a4\uace0 \uc788\uace0, Branch\uac00 \ub2e4\uc2dc \ud2b9\uc815 Commit\uc744 \uac00\ub9ac\ud0a8\ub2e4.<\/p>\n\n\n\n
HEAD -> main -> Commit C<\/code><\/pre>\n\n\n\n
Branch\ub97c \uc774\ub3d9\ud558\uba74 HEAD\ub3c4 \ud568\uaed8 \uc774\ub3d9\ud55c\ub2e4.<\/p>\n\n\n\n
git switch feature<\/code><\/pre>\n\n\n\n
\uc744 \uc2e4\ud589\ud558\uba74<\/p>\n\n\n\n
HEAD -> feature -> Commit F<\/code><\/pre>\n\n\n\n
\uc640 \uac19\uc740 \uc0c1\ud0dc\uac00 \ub41c\ub2e4.<\/p>\n\n\n\n
\uadf8\ub798\uc11c git status<\/code>\uc5d0\uc11c \ud604\uc7ac Branch\uac00 \ubb34\uc5c7\uc778\uc9c0 \ud655\uc778\ud558\ub294 \uac83\uc774 \uc911\uc694\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Detached HEAD<\/h2>\n\n\n\n
\ud2b9\uc815 Commit\uc744 \uc9c1\uc811 Checkout\ud558\uac70\ub098 Switch\ud558\uba74 Branch\uac00 \uc544\ub2cc Commit \uc790\uccb4\ub97c \ubc14\ub77c\ubcf4\ub294 \uc0c1\ud0dc\uac00 \ub420 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
HEAD -> Commit C \/ main -> Commit E<\/code><\/pre>\n\n\n\n
\uc774\uac83\uc744 Detached HEAD \uc0c1\ud0dc\ub77c\uace0 \ud55c\ub2e4.<\/p>\n\n\n\n
\uc774 \uc0c1\ud0dc\uc5d0\uc11c \uc0c8\ub85c\uc6b4 Commit\uc744 \ub9cc\ub4e4\uc5b4\ub3c4 \uc5b4\ub5a4 Branch\uc5d0\uc11c\ub3c4 \ud574\ub2f9 Commit\uc744 \uac00\ub9ac\ud0a4\uc9c0 \uc54a\uc744 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ud2b9\uc815 \uacfc\uac70 \ubc84\uc804\uc744 \ud655\uc778\ud558\uac70\ub098 \ub514\ubc84\uae45\ud560 \ub54c\ub294 \uc720\uc6a9\ud558\uc9c0\ub9cc, \uc791\uc5c5\uc744 \uacc4\uc18d\ud560 \ubaa9\uc801\uc774\ub77c\uba74 \uc0c8\ub85c\uc6b4 Branch\ub97c \ub9cc\ub4dc\ub294 \uac83\uc774 \uc548\uc804\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Remote Repository<\/h2>\n\n\n\n
Git \uc790\uccb4\ub294 \ub85c\uceec\uc5d0\uc11c \ub3d9\uc791\ud558\ub294 \ubd84\uc0b0 \ubc84\uc804 \uad00\ub9ac \uc2dc\uc2a4\ud15c\uc774\ub2e4.<\/p>\n\n\n\n
\ub530\ub77c\uc11c Git\uc744 \uc124\uce58\ud588\ub2e4\uace0 \ud574\uc11c GitHub \uac19\uc740 \uc11c\ubc84\uac00 \ud544\uc694\ud55c \uac83\uc740 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
Local Repository<\/code><\/pre>\n\n\n\n
\ub9cc\uc73c\ub85c\ub3c4 Commit, Branch, Merge, Rebase \ub4f1\uc758 \uc791\uc5c5\uc744 \ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc5ec\uae30\uc5d0 \uc6d0\uaca9 Repository\ub97c \uc5f0\uacb0\ud558\uba74 \ub2e4\ub978 \uac1c\ubc1c\uc790\uc640 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uacf5\uc720\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Local Repository -> push -> Remote Repository -> fetch \/ pull -> Local Repository<\/code><\/pre>\n\n\n\n
GitHub, GitLab, Bitbucket \ub4f1\uc774 \ub300\ud45c\uc801\uc778 Git \ud638\uc2a4\ud305 \uc11c\ube44\uc2a4\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Push<\/h2>\n\n\n\n
push<\/code>\ub294 \ub85c\uceec Repository\uc758 Commit\uc744 Remote Repository\uc5d0 \uc804\uc1a1\ud558\ub294 \uc791\uc5c5\uc774\ub2e4.<\/p>\n\n\n\n
git push origin main<\/code><\/pre>\n\n\n\n
\uac1c\ub150\uc801\uc73c\ub85c \ubcf4\uba74<\/p>\n\n\n\n
Local A -> B -> C -> push -> Remote A -> B -> C<\/code><\/pre>\n\n\n\n
\uac00 \ub41c\ub2e4.<\/p>\n\n\n\n
\uc8fc\uc758\ud560 \uc810\uc740 push<\/code>\uac00 \ud30c\uc77c\uc744 \ub2e8\uc21c \uc5c5\ub85c\ub4dc\ud558\ub294 \uac83\uc774 \uc544\ub2c8\ub77c Git Commit\uc744 \uc6d0\uaca9 Repository\uc5d0 \uc804\ub2ec\ud558\ub294 \uc791\uc5c5<\/strong>\uc774\ub77c\ub294 \uac83\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Fetch<\/h2>\n\n\n\n
fetch<\/code>\ub294 Remote Repository\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ub85c\uceec\ub85c \uac00\uc838\uc624\uc9c0\ub9cc \ud604\uc7ac \uc791\uc5c5 \ud30c\uc77c\uc5d0\ub294 \ubc14\ub85c \uc801\uc6a9\ud558\uc9c0 \uc54a\ub294\ub2e4.<\/p>\n\n\n\n
git fetch origin<\/code><\/pre>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 Remote\uc5d0 \uc0c8\ub85c\uc6b4 Commit\uc774 \uc0dd\uacbc\ub2e4\uba74<\/p>\n\n\n\n
Local -> A -> B \/ Remote -> A -> B -> C<\/code><\/pre>\n\n\n\n
Fetch \ud6c4\uc5d0\ub294 \ub85c\uceec\uc774 Remote\uc758 Commit \uc815\ubcf4\ub97c \uc54c\uac8c \ub41c\ub2e4.<\/p>\n\n\n\n
Local Branch -> A -> B \/ origin\/main -> A -> B -> C<\/code><\/pre>\n\n\n\n
\ud558\uc9c0\ub9cc \ud604\uc7ac Working Directory\uac00 \uc790\ub3d9\uc73c\ub85c C<\/code> \uc0c1\ud0dc\uac00 \ub418\ub294 \uac83\uc740 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\uc774\uac83\uc774 pull<\/code>\uacfc\uc758 \uc911\uc694\ud55c \ucc28\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Pull<\/h2>\n\n\n\n
pull<\/code>\uc740 \uc77c\ubc18\uc801\uc73c\ub85c Remote\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uac00\uc838\uc628 \ub2e4\uc74c \ud604\uc7ac Branch\uc5d0 \ud1b5\ud569\ud558\ub294 \uc791\uc5c5\uc774\ub2e4.<\/p>\n\n\n\n
\uac1c\ub150\uc801\uc73c\ub85c\ub294<\/p>\n\n\n\n
git pull -> git fetch + git merge<\/code><\/pre>\n\n\n\n
\uc640 \ube44\uc2b7\ud558\uac8c \uc0dd\uac01\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ub2e4\ub9cc \uc2e4\uc81c \ub3d9\uc791\uc740 \uc124\uc815\uc5d0 \ub530\ub77c Rebase \ubc29\uc2dd\uc73c\ub85c \uad6c\uc131\ud560 \uc218\ub3c4 \uc788\ub2e4.<\/p>\n\n\n\n
git pull<\/code><\/pre>\n\n\n\n
\uc740 \ud3b8\ub9ac\ud558\uc9c0\ub9cc \ubb34\uc870\uac74 \uc0ac\uc6a9\ud558\ub294 \uc2b5\uad00\uc740 \uc88b\uc9c0 \uc54a\ub2e4.<\/p>\n\n\n\n
\uc6d0\uaca9\uc5d0 \uc5b4\ub5a4 \ubcc0\uacbd\uc774 \uc788\ub294\uc9c0 \uba3c\uc800 \ud655\uc778\ud558\uace0 \uc2f6\ub2e4\uba74<\/p>\n\n\n\n
git fetch<\/code><\/pre>\n\n\n\n
\ud6c4 \uc0c1\ud0dc\ub97c \ud655\uc778\ud558\ub294 \uac83\uc774 \ub354 \uba85\ud655\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Origin<\/h2>\n\n\n\n
Git\uc5d0\uc11c origin<\/code>\uc740 \ud2b9\ubcc4\ud55c \uba85\ub839\uc5b4\uac00 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
Remote Repository\uc5d0 \ubd99\uc778 \uae30\ubcf8\uc801\uc778 \uc774\ub984\uc77c \ubfd0\uc774\ub2e4.<\/p>\n\n\n\n
origin -> https:\/\/github.com\/example\/project.git<\/code><\/pre>\n\n\n\n
\ub2e4\uc74c\uacfc \uac19\uc774 \ub2e4\ub978 \uc774\ub984\uc744 \uc0ac\uc6a9\ud560 \uc218\ub3c4 \uc788\ub2e4.<\/p>\n\n\n\n
git remote add upstream ...<\/code><\/pre>\n\n\n\n
\uadf8\ub7ec\uba74<\/p>\n\n\n\n
origin -> \ub0b4\uac00 \uc791\uc5c5\ud558\ub294 \uc6d0\uaca9 Repository\nupstream -> \uc6d0\ubcf8 Repository<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \uc5ed\ud560\uc744 \ub098\ub20c \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Fork \uae30\ubc18\uc758 \uc624\ud508\uc18c\uc2a4 \uac1c\ubc1c\uc5d0\uc11c \uc790\uc8fc \ubcfc \uc218 \uc788\ub294 \uad6c\uc870\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Reset<\/h2>\n\n\n\n
Reset\uc740 \ud604\uc7ac Branch\uc758 \uc0c1\ud0dc\ub97c \ud2b9\uc815 Commit \uae30\uc900\uc73c\ub85c \uc774\ub3d9\uc2dc\ud0a4\ub294 \uc791\uc5c5\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
A -> B -> C -> D<\/code><\/pre>\n\n\n\n
\uc5d0\uc11c D<\/code>\ub97c \uc5c6\uc560\uace0 C<\/code>\ub85c \ub3cc\uc544\uac00\uace0 \uc2f6\ub2e4\uba74 Reset\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
A -> B -> C<\/code><\/pre>\n\n\n\n
\ub2e4\ub9cc Reset\uc740 \uc635\uc158\uc5d0 \ub530\ub77c \ub3d9\uc791\uc774 \ud06c\uac8c \ub2ec\ub77c\uc9c4\ub2e4.<\/p>\n\n\n\n
Soft<\/h3>\n\n\n\n
git reset --soft HEAD~1<\/code><\/pre>\n\n\n\n
Commit\ub9cc \ub418\ub3cc\ub9ac\uace0 \ubcc0\uacbd \ub0b4\uc6a9\uc740 Staging Area\uc5d0 \ub0a8\uae34\ub2e4.<\/p>\n\n\n\n
Mixed<\/h3>\n\n\n\n
git reset HEAD~1<\/code><\/pre>\n\n\n\n
Commit\uacfc Staging \uc0c1\ud0dc\ub97c \ub418\ub3cc\ub9ac\uc9c0\ub9cc Working Directory\uc758 \ud30c\uc77c \ubcc0\uacbd\uc740 \uc720\uc9c0\ud55c\ub2e4.<\/p>\n\n\n\n
Hard<\/h3>\n\n\n\n
git reset --hard HEAD~1<\/code><\/pre>\n\n\n\n
Commit\ubfd0\ub9cc \uc544\ub2c8\ub77c Working Directory\uae4c\uc9c0 \ud574\ub2f9 \uc0c1\ud0dc\ub85c \ub418\ub3cc\ub9b0\ub2e4.<\/p>\n\n\n\n
--hard<\/code>\ub294 \uc2e4\uc81c \uc791\uc5c5 \ub0b4\uc6a9\uc744 \uc783\uc744 \uc218 \uc788\uc73c\ubbc0\ub85c \uc8fc\uc758\ud574\uc11c \uc0ac\uc6a9\ud574\uc57c \ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Revert<\/h2>\n\n\n\n
\uc774\ubbf8 \uacf5\uc720\ub41c Commit\uc744 \ub418\ub3cc\ub9b4 \ub54c\ub294 reset<\/code>\ubcf4\ub2e4 revert<\/code>\uac00 \uc801\ud569\ud55c \uacbd\uc6b0\uac00 \ub9ce\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
A -> B -> C<\/code><\/pre>\n\n\n\n
\uc5d0\uc11c C<\/code>\uc758 \ubcc0\uacbd\uc744 \ucde8\uc18c\ud558\uace0 \uc2f6\ub2e4\uba74 Revert\ub294 \uc0c8\ub85c\uc6b4 Commit\uc744 \ub9cc\ub4e0\ub2e4.<\/p>\n\n\n\n
A -> B -> C -> R<\/code><\/pre>\n\n\n\n
R<\/code>\uc740 C<\/code>\uc758 \ubcc0\uacbd\uc744 \ubc18\ub300\ub85c \uc801\uc6a9\ud55c Commit\uc774\ub2e4.<\/p>\n\n\n\n
\ub530\ub77c\uc11c \uae30\uc874 history\ub97c \uc9c0\uc6b0\uc9c0 \uc54a\ub294\ub2e4.<\/p>\n\n\n\n
\uacf5\uc720\ub41c Branch\uc5d0\uc11c\ub294 \uc774\ub7f0 \ubc29\uc2dd\uc774 \uc548\uc804\ud558\ub2e4.<\/p>\n\n\n\n
Reset -> history\ub97c \uc774\ub3d9\ud558\uac70\ub098 \uc7ac\uc791\uc131\nRevert -> history\ub97c \uc720\uc9c0\ud558\uba74\uc11c \ubcc0\uacbd\uc744 \ucde8\uc18c<\/code><\/pre>\n\n\n\n
\n\n\n\n
Stash<\/h2>\n\n\n\n
\uc791\uc5c5 \uc911\uc778\ub370 \ub2e4\ub978 Branch\ub85c \uae09\ud558\uac8c \uc774\ub3d9\ud574\uc57c \ud558\ub294 \uc0c1\ud669\uc774 \uc788\ub2e4.<\/p>\n\n\n\n
\uc544\uc9c1 Commit\ud558\uae30\uc5d0\ub294 \uc791\uc5c5\uc774 \ub35c \ub05d\ub0ac\uc9c0\ub9cc \ud604\uc7ac \ubcc0\uacbd\uc0ac\ud56d\uc744 \uc7a0\uc2dc \uce58\uc6cc\ub450\uace0 \uc2f6\ub2e4\uba74 Stash\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
git stash<\/code><\/pre>\n\n\n\n
\uadf8\ub7ec\uba74 \ud604\uc7ac \ubcc0\uacbd\uc0ac\ud56d\uc744 \uc784\uc2dc\ub85c \uc800\uc7a5\ud558\uace0 Working Directory\ub97c \uae68\ub057\ud558\uac8c \ub9cc\ub4e4 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ub098\uc911\uc5d0<\/p>\n\n\n\n
git stash pop<\/code><\/pre>\n\n\n\n
\uc73c\ub85c \ub2e4\uc2dc \uac00\uc838\uc62c \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\ub2e4\ub9cc Stash\ub97c \uc7a5\uae30\uc801\uc778 \uc791\uc5c5 \uc800\uc7a5\uc18c\ucc98\ub7fc \uc0ac\uc6a9\ud558\ub294 \uac83\uc740 \uc88b\uc9c0 \uc54a\ub2e4.<\/p>\n\n\n\n
\uac00\ub2a5\ud558\uba74 \uc758\ubbf8 \uc788\ub294 \uc791\uc5c5 \ub2e8\uc704\ub85c Commit\uc744 \ub9cc\ub4e4\uc5b4\ub450\ub294 \uac83\uc774 \ub0ab\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Cherry-pick<\/h2>\n\n\n\n
\ud2b9\uc815 Branch\uc758 Commit \ud558\ub098\ub9cc \uac00\uc838\uc624\uace0 \uc2f6\uc744 \ub54c \uc0ac\uc6a9\ud558\ub294 \uac83\uc774 Cherry-pick\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4<\/p>\n\n\n\n
main -> A -> B -> C \/ feature -> D -> E<\/code><\/pre>\n\n\n\n
\uc5d0\uc11c D<\/code>\uc758 \ubc84\uadf8 \uc218\uc815\ub9cc main<\/code>\uc5d0 \uac00\uc838\uc624\uace0 \uc2f6\ub2e4\uba74<\/p>\n\n\n\n
git cherry-pick D<\/code><\/pre>\n\n\n\n
\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uadf8\ub7ec\uba74<\/p>\n\n\n\n
main -> A -> B -> C -> D'<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ud574\ub2f9 \ubcc0\uacbd\ub9cc \uc0c8\ub85c\uc6b4 Commit\uc73c\ub85c \uc801\uc6a9\ub41c\ub2e4.<\/p>\n\n\n\n
Hotfix\ub97c \ub2e4\ub978 Branch\uc5d0 \uc804\ub2ec\ud560 \ub54c \uc720\uc6a9\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Tag<\/h2>\n\n\n\n
Tag\ub294 \ud2b9\uc815 Commit\uc5d0 \uc774\ub984\uc744 \ubd99\uc774\ub294 \uae30\ub2a5\uc774\ub2e4.<\/p>\n\n\n\n
A -> B -> C -> D \/ v1.0.0 -> C<\/code><\/pre>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 Release \ubc84\uc804\uc744 \ud45c\uc2dc\ud560 \ub54c \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
git tag v1.0.0<\/code><\/pre>\n\n\n\n
Branch\uac00 \uacc4\uc18d \uc774\ub3d9\ud558\ub294 \ucc38\uc870\ub77c\uba74 Tag\ub294 \ud2b9\uc815 \uc2dc\uc810\uc744 \ud45c\uc2dc\ud558\ub294 \uc6a9\ub3c4\ub85c \ub9ce\uc774 \uc0ac\uc6a9\ud55c\ub2e4.<\/p>\n\n\n\n
Branch -> \uacc4\uc18d \uc774\ub3d9\nTag -> \ud2b9\uc815 \ubc84\uc804\uc744 \ud45c\uc2dc<\/code><\/pre>\n\n\n\n
\uac8c\uc784 \ube4c\ub4dc\ub098 \uc11c\ubc84 \ubc30\ud3ec \ubc84\uc804\uc744 \uad00\ub9ac\ud560 \ub54c\ub3c4 \uc720\uc6a9\ud558\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uc758 \ud575\uc2ec \uba85\ub839\uc5b4 \ud750\ub984<\/h2>\n\n\n\n
\uc2e4\uc81c\ub85c \uc790\uc8fc \uc0ac\uc6a9\ud558\ub294 \uae30\ubcf8 \ud750\ub984\uc740 \uc774 \uc815\ub3c4\ub2e4.<\/p>\n\n\n\n
git status -> git add . -> git commit -m \"Add inventory system\" -> git push origin feature\/inventory<\/code><\/pre>\n\n\n\n
\ub2e4\ub978 \uc0ac\ub78c\uc758 \ubcc0\uacbd\uc0ac\ud56d\uc744 \uac00\uc838\uc62c \ub54c\ub294<\/p>\n\n\n\n
git fetch origin<\/code><\/pre>\n\n\n\n
\ub85c \uc6d0\uaca9 \uc0c1\ud0dc\ub97c \ud655\uc778\ud55c \ub2e4\uc74c Merge\ub098 Rebase\ub97c \uc120\ud0dd\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc791\uc5c5\uc744 \uc2dc\uc791\ud560 \ub54c\ub294<\/p>\n\n\n\n
git switch main -> git pull -> git switch -c feature\/inventory<\/code><\/pre>\n\n\n\n
\ucc98\ub7fc \ucd5c\uc2e0 \uc0c1\ud0dc\uc758 Branch\uc5d0\uc11c \uc0c8\ub85c\uc6b4 \uc791\uc5c5 Branch\ub97c \ub9cc\ub4dc\ub294 \ubc29\uc2dd\uc774 \uc77c\ubc18\uc801\uc774\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uc744 \uc798 \uc0ac\uc6a9\ud558\ub294 \uae30\uc900<\/h2>\n\n\n\n
Git\uc744 \uc798 \uc0ac\uc6a9\ud55c\ub2e4\ub294 \uac83\uc740 \uba85\ub839\uc5b4\ub97c \ub9ce\uc774 \uc544\ub294 \uac83\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\uc911\uc694\ud55c \uac83\uc740 \ubcc0\uacbd \uc774\ub825\uc744 \uad00\ub9ac \uac00\ub2a5\ud55c \uc0c1\ud0dc\ub85c \uc720\uc9c0\ud558\ub294 \uac83<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 Commit\uc744 \ub2e4\uc74c\uacfc \uac19\uc774 \uad6c\uc131\ud558\ub294 \ud3b8\uc774 \uc88b\ub2e4.<\/p>\n\n\n\n
Add player movement -> Fix player movement collision -> Add player attack -> Add attack cooldown -> Fix attack cooldown bug<\/code><\/pre>\n\n\n\n
\uac01 Commit\uc774 \ud558\ub098\uc758 \uc758\ubbf8\ub97c \uac16\ub294\ub2e4.<\/p>\n\n\n\n
\uadf8\ub7ec\uba74 \ud2b9\uc815 \uae30\ub2a5\uc744 \ucc3e\uac70\ub098 \ubc84\uadf8\uac00 \ubc1c\uc0dd\ud588\uc744 \ub54c \ubcc0\uacbd \uc774\ub825\uc744 \ub530\ub77c\uac00\uae30 \uc27d\ub2e4.<\/p>\n\n\n\n
\ubc18\ub300\ub85c<\/p>\n\n\n\n
Update -> Fix -> test -> asdf -> final -> final2 -> really final<\/code><\/pre>\n\n\n\n
\uac19\uc740 Commit history\ub294 Git\uc744 \uc0ac\uc6a9\ud558\uace0 \uc788\uc5b4\ub3c4 \uc774\ub825 \uad00\ub9ac\ub77c\ub294 \ubaa9\uc801\uc744 \uc81c\ub300\ub85c \ub2ec\uc131\ud558\uc9c0 \ubabb\ud55c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uacfc GitHub\ub294 \ub2e4\ub974\ub2e4<\/h2>\n\n\n\n
\uc774 \ubd80\ubd84\uc740 \ucc98\uc74c Git\uc744 \uc0ac\uc6a9\ud560 \ub54c \uc790\uc8fc \ud5f7\uac08\ub9b0\ub2e4.<\/p>\n\n\n\n
Git -> \ubc84\uc804 \uad00\ub9ac \uc2dc\uc2a4\ud15c\nGitHub -> Git Repository\ub97c \ud638\uc2a4\ud305\ud558\ub294 \uc11c\ube44\uc2a4<\/code><\/pre>\n\n\n\n
Git\uc740 \ub85c\uceec \ucef4\ud4e8\ud130\uc5d0\uc11c\ub3c4 \ub3d9\uc791\ud55c\ub2e4.<\/p>\n\n\n\n
GitHub\ub294 Git Repository\ub97c \uc6d0\uaca9\uc5d0 \uc800\uc7a5\ud558\uace0 \ud611\uc5c5\ud560 \uc218 \uc788\ub3c4\ub85d \uc5ec\ub7ec \uae30\ub2a5\uc744 \uc81c\uacf5\ud55c\ub2e4.<\/p>\n\n\n\n
GitLab\uc774\ub098 Bitbucket\ub3c4 \uac19\uc740 \ubc94\uc8fc\uc758 \uc11c\ube44\uc2a4\ub2e4.<\/p>\n\n\n\n
\ub530\ub77c\uc11c<\/p>\n\n\n\n
Git != GitHub<\/code><\/pre>\n\n\n\n
\ub2e4.<\/p>\n\n\n\n
GitHub \uc5c6\uc774\ub3c4 Git\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uc744 \uc0ac\uc6a9\ud558\ub294 \uac1c\ubc1c Workflow<\/h2>\n\n\n\n
\uac1c\uc778 \ud504\ub85c\uc81d\ud2b8\ub77c\uba74 \ub2e8\uc21c\ud558\uac8c \uc0ac\uc6a9\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
\uc791\uc5c5 \uc2dc\uc791 -> Branch \uc0dd\uc131 -> \ucf54\ub4dc \uc791\uc131 -> \ud14c\uc2a4\ud2b8 -> Commit -> Push<\/code><\/pre>\n\n\n\n
\ud300 \uac1c\ubc1c\uc5d0\uc11c\ub294 \uc5ec\uae30\uc5d0 Code Review \uacfc\uc815\uc774 \ucd94\uac00\ub41c\ub2e4.<\/p>\n\n\n\n
main -> Feature Branch -> \uac1c\ubc1c -> Commit -> Push -> Pull Request -> Code Review -> Merge -> main<\/code><\/pre>\n\n\n\n
\uc774 \uacfc\uc815\uc5d0\uc11c Git\uc740 \ub2e8\uc21c\ud55c \ubc31\uc5c5 \ub3c4\uad6c\uac00 \uc544\ub2c8\ub77c \ud611\uc5c5 \uacfc\uc815\uc5d0\uc11c \ubcc0\uacbd\uc0ac\ud56d\uc744 \ucd94\uc801\ud558\uace0 \ud1b5\ud569\ud558\ub294 \uae30\ubc18 \uc2dc\uc2a4\ud15c<\/strong>\uc774 \ub41c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uacfc CI\/CD<\/h2>\n\n\n\n
Git\uc740 CI\/CD\uc640\ub3c4 \uc790\uc5f0\uc2a4\ub7fd\uac8c \uc5f0\uacb0\ub41c\ub2e4.<\/p>\n\n\n\n
\uc608\ub97c \ub4e4\uc5b4 \uac1c\ubc1c\uc790\uac00 Push\ub97c \ud558\uba74<\/p>\n\n\n\n
git push -> CI Server -> Build \/ Test \/ Static Analysis -> \uc131\uacf5 -> Deploy<\/code><\/pre>\n\n\n\n
\uac19\uc740 \uc790\ub3d9\ud654 Workflow\ub97c \uad6c\uc131\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
GitHub Actions, GitLab CI\/CD \uac19\uc740 \uc2dc\uc2a4\ud15c\uc774 \ub300\ud45c\uc801\uc774\ub2e4.<\/p>\n\n\n\n
\uc774\ub807\uac8c \ub418\uba74 Git Commit\uacfc Branch\uac00 \ub2e8\uc21c\ud55c \ucf54\ub4dc \uc800\uc7a5 \ub2e8\uc704\ub97c \ub118\uc5b4 \ube4c\ub4dc\uc640 \ubc30\ud3ec\ub97c \ubc1c\uc0dd\uc2dc\ud0a4\ub294 \uc774\ubca4\ud2b8<\/strong>\uac00 \ub41c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
Git\uc5d0\uc11c \uc911\uc694\ud55c \uac83\uc740 \uc0c1\ud0dc\uc640 \uc774\ub825\uc774\ub2e4<\/h2>\n\n\n\n
Git\uc744 \ucc98\uc74c \ubc30\uc6b8 \ub54c\ub294 \uba85\ub839\uc5b4\ubd80\ud130 \uc678\uc6b0\uae30 \uc27d\ub2e4.<\/p>\n\n\n\n
add \/ commit \/ push \/ pull \/ merge \/ rebase \/ reset \/ revert \/ stash<\/code><\/pre>\n\n\n\n
\ud558\uc9c0\ub9cc \uba85\ub839\uc5b4\ub9cc \uc678\uc6b0\uba74 \uc0c1\ud669\uc774 \uc870\uae08\ub9cc \ubcf5\uc7a1\ud574\uc838\ub3c4 \ud5f7\uac08\ub9b0\ub2e4.<\/p>\n\n\n\n
\uba3c\uc800 \ud604\uc7ac \uc0c1\ud0dc\ub97c \ubcf4\ub294 \uac83\uc774 \uc911\uc694\ud558\ub2e4.<\/p>\n\n\n\n
Working Directory -> Staging Area -> Local Repository -> Remote Repository<\/code><\/pre>\n\n\n\n
\uadf8\ub9ac\uace0 Commit history\uac00 \uc5b4\ub5bb\uac8c \uc5f0\uacb0\ub418\uc5b4 \uc788\ub294\uc9c0 \ubcf8\ub2e4.<\/p>\n\n\n\n
A -> B -> C -> D \/ E -> F<\/code><\/pre>\n\n\n\n
\uadf8\ub2e4\uc74c \uc9c0\uae08 \ub0b4\uac00 \uc6d0\ud558\ub294 \uac83\uc774 \ubb34\uc5c7\uc778\uc9c0 \ud310\ub2e8\ud55c\ub2e4.<\/p>\n\n\n\n
\ubcc0\uacbd\uc0ac\ud56d \uc800\uc7a5 -> Commit\n\uc791\uc5c5 \ubd84\ub9ac -> Branch\nBranch \ud1b5\ud569 -> Merge \/ Rebase\n\uc6d0\uaca9\uc5d0 \uacf5\uc720 -> Push\n\uc6d0\uaca9 \ubcc0\uacbd\uc0ac\ud56d \ud655\uc778 -> Fetch\n\uc6d0\uaca9 \ubcc0\uacbd\uc0ac\ud56d \ud1b5\ud569 -> Pull\n\ud2b9\uc815 \ubcc0\uacbd \ucde8\uc18c -> Revert\n\uacfc\uac70 \uc0c1\ud0dc\ub85c \uc774\ub3d9 -> Reset\n\ud2b9\uc815 Commit\ub9cc \uac00\uc838\uc624\uae30 -> Cherry-pick<\/code><\/pre>\n\n\n\n
\uc774\ub807\uac8c \uc0dd\uac01\ud558\uba74 Git \uba85\ub839\uc5b4\uac00 \ubaa9\uc801\uc5d0 \ub530\ub77c \uc790\uc5f0\uc2a4\ub7fd\uac8c \uc5f0\uacb0\ub41c\ub2e4.<\/p>\n\n\n\n
\n\n\n\n
\uc815\ub9ac<\/h2>\n\n\n\n
Git\uc740 \ud30c\uc77c\uc744 \ubc31\uc5c5\ud558\ub294 \ud504\ub85c\uadf8\ub7a8\uc774 \uc544\ub2c8\ub2e4.<\/p>\n\n\n\n
\ud504\ub85c\uc81d\ud2b8\uc758 \ubcc0\uacbd \uc774\ub825\uc744 Commit\uc774\ub77c\ub294 \ub2e8\uc704\ub85c \uae30\ub85d\ud558\uace0, Branch\ub97c \ud1b5\ud574 \uc791\uc5c5\uc744 \ubd84\ub9ac\ud558\uace0, Merge\uc640 Rebase\ub97c \ud1b5\ud574 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ud1b5\ud569\ud558\ub294 \ubc84\uc804 \uad00\ub9ac \uc2dc\uc2a4\ud15c<\/strong>\uc774\ub2e4.<\/p>\n\n\n\n
\ud575\uc2ec \uad6c\uc870\ub294 \ub2e4\uc74c \uc815\ub3c4\ub85c \uc815\ub9ac\ud560 \uc218 \uc788\ub2e4.<\/p>\n\n\n\n
Working Directory -> Staging Area -> Commit -> Branch -> Remote Repository<\/code><\/pre>\n\n\n\n
\uadf8\ub9ac\uace0 \uc2e4\uc81c \uac1c\ubc1c\uc5d0\uc11c\ub294<\/p>\n\n\n\n
Branch \uc0dd\uc131 -> \uc791\uc5c5 -> Commit -> Push -> Review -> Merge<\/code><\/pre>\n\n\n\n
\ub77c\ub294 \ud750\ub984\uc744 \ubc18\ubcf5\ud55c\ub2e4.<\/p>\n\n\n\n
Git\uc744 \uc81c\ub300\ub85c \uc774\ud574\ud558\uba74 reset<\/code>, revert<\/code>, rebase<\/code>, cherry-pick<\/code> \uac19\uc740 \uba85\ub839\uc5b4\ub3c4 \ub2e8\uc21c \uc554\uae30\uac00 \ud544\uc694\ud558\uc9c0 \uc54a\ub2e4. \ud604\uc7ac Repository\uac00 \uc5b4\ub5a4 \uc0c1\ud0dc\uc774\uace0, \uc5b4\ub5a4 \uc774\ub825\uc744 \ub9cc\ub4e4\uace0 \uc2f6\uc740\uc9c0<\/strong>\ub97c \ud310\ub2e8\ud558\uba74 \ud544\uc694\ud55c \uba85\ub839\uc5b4\uac00 \uacb0\uc815\ub41c\ub2e4.<\/p>\n\n\n\n
\uacb0\uad6d Git\uc758 \ubcf8\uc9c8\uc740 \ud558\ub098\ub2e4.<\/p>\n\n\n\n
\ucf54\ub4dc\uc758 \ud604\uc7ac \uc0c1\ud0dc\ub9cc \uad00\ub9ac\ud558\ub294 \uac83\uc774 \uc544\ub2c8\ub77c, \ucf54\ub4dc\uac00 \uc5b4\ub5bb\uac8c \ud604\uc7ac \uc0c1\ud0dc\uc5d0 \ub3c4\ub2ec\ud588\ub294\uc9c0\ub97c \uad00\ub9ac\ud558\ub294 \uac83.<\/strong><\/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. \ud30c\uc77c\uc744 \uc218\uc815\ud558\uace0 \uc800\uc7a5\ud558\ub294 \uac83\ub9cc\uc73c\ub85c\ub294 \uc774\uc804 \uc0c1\ud0dc\ub97c \uc548\uc804\ud558\uac8c \ubcf5\uad6c\ud558\uae30 \uc5b4\ub835\ub2e4. \uc5ec\ub7ec \uae30\ub2a5\uc744 \ub3d9\uc2dc\uc5d0 \uac1c\ubc1c\ud558\uac70\ub098 \uc5ec\ub7ec \uac1c\ubc1c\uc790\uac00 \uac19\uc740 \ucf54\ub4dc\ub97c \uc218\uc815\ud558\uae30 \uc2dc\uc791\ud558\uba74 \uc5b4\ub5a4 \ubcc0\uacbd\uc774 \uc5b8\uc81c \ubc1c\uc0dd\ud588\uace0, \ub204\uac00 \ubb34\uc5c7\uc744 \uc218\uc815\ud588\uc73c\uba70, \ud2b9\uc815 \ubcc0\uacbd\uc744 \ub418\ub3cc\ub9ac\ub824\uba74 \uc5b4\ub514\uae4c\uc9c0 \ub418\ub3cc\ub824\uc57c \ud558\ub294\uc9c0 \uad00\ub9ac\ud560 \ud544\uc694\uac00 \uc0dd\uae34\ub2e4. Git\uc740 \uc774 \ubb38\uc81c\ub97c \ubcc0\uacbd \uc774\ub825\uacfc \uc791\uc5c5 \uc0c1\ud0dc\ub97c \uad00\ub9ac\ud558\ub294 \uac83\uc73c\ub85c \ud574\uacb0\ud55c\ub2e4. […]<\/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-1720","post","type-post","status-publish","format-standard","hentry","category-tools"],"_links":{"self":[{"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts\/1720","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=1720"}],"version-history":[{"count":4,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts\/1720\/revisions"}],"predecessor-version":[{"id":2000,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=\/wp\/v2\/posts\/1720\/revisions\/2000"}],"wp:attachment":[{"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1720"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1720"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wayhope.kro.kr\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1720"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}