Etc

[Git] VS code์—์„œ git branch ๋ณ€๊ฒฝ, ์ƒ์„ฑ, ๊ฒŒ์‹œ

seulye 2024. 6. 5. 10:51

main์œผ๋กœ ๋˜์–ด ์žˆ๋Š” ๋ธŒ๋žœ์น˜๋ฅผ origin/working์œผ๋กœ ๋ณ€๊ฒฝํ•ด๋ณด์ž!

vs code->์†Œ์Šค์ œ์–ด->BRANCHES->main ์šฐํด๋ฆญ์—์„œ switch to branch..์ด๋Ÿฐ๊ฑฐ ๊ณ„์† ํ•ด๋ดค์ง€๋งŒ ์ž˜ ๋˜์ง€ ์•Š์•˜๋‹ค.

๊ณ„์† main์œผ๋กœ ์„ค์ •๋˜์–ด ์žˆ๋Š” ๋А๋‚Œ. ๊ทธ๋ž˜์„œ ๊ทธ๋ƒฅ ํ„ฐ๋ฏธ๋„๋กœ ํ•˜๊ธฐ๋กœ..!

 

 

1. ํ˜„์žฌ ๋ธŒ๋žœ์น˜ ํ™•์ธ

git branch

 

 

Detached Head๋ž€, ๋ง ๊ทธ๋Œ€๋กœ head๊ฐ€ (branch๋กœ๋ถ€ํ„ฐ) ๋–จ์–ด์ ธ์žˆ๋Š” ์ƒํƒœ๋ฅผ ๋œปํ•œ๋‹ค. 

์ฆ‰, branch๋ฅผ ํ†ตํ•ด์„œ๊ฐ€ ์•„๋‹ˆ๋ผ ์ง์ ‘ ๋‹ค์ด๋ ‰ํŠธ๋กœ commit์„ ์ฐธ์กฐํ•˜๊ณ  ์žˆ๋Š” ์ƒํƒœ๋ฅผ ๋œปํ•œ๋‹ค. 

(์ถœ์ฒ˜ : https://devcamus.tistory.com/6)

 

 

 

2. branch ๋ณ€๊ฒฝ

git branch origin/working

 

 

BRANCHES์— origin/working์ด ์ƒ๊ฒผ๊ณ , ๋ณ€๊ฒฝ์ด ๋˜์—ˆ๋‹ค! 

 

 

๊ทผ๋ฐ, ์ƒ๊ฐํ•ด๋ณด๋‹ˆ ๊ทธ๋ƒฅ ์ƒˆ๋กœ์šด ๋ธŒ๋žœ์น˜๋ฅผ ํŒŒ๋Š” ๊ฒŒ ๋งž๋Š” ๊ฒƒ ๊ฐ™๋‹ค.

 

 

3. ์ƒˆ๋กœ์šด ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ

git switch -c origin/draft

 

origin์„ ๋ถ™์˜€๋”๋‹ˆ origin/origin/draft๊ฐ€ ๋˜์–ด๋ฒ„๋ ธ๋‹ค.. ๋ธŒ๋žœ์น˜ ์ด๋ฆ„์„ ๋ฐ”๊พธ์ž

 

 

4. ๋ธŒ๋žœ์น˜ ์ด๋ฆ„ ๋ณ€๊ฒฝ 

git branch -m draft

 

 

๋‚ด๊ฐ€ ์›ํ•œ๊ฑด ์ด๊ฒŒ ์•„๋‹Œ๋ฐ..!

 

 

5. ๋ธŒ๋žœ์น˜ ์‚ญ์ œ

git branch -d draft

 

Cannot delete branch 'draft' checked out at '..'

ํ˜„์žฌ ํ™œ์„ฑ์ค‘์ธ ๋ถ„๊ธฐ๋Š” ์‚ญ์ œํ•  ์ˆ˜ ์—†๋‹ค!

main์œผ๋กœ ์ฒดํฌ์•„์›ƒ ํ•˜๊ณ  ๋‹ค์‹œ ์‚ญ์ œํ•œ๋‹ค. 

 

6. ๋‹ค์‹œ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ํ›„ ๊ฒŒ์‹œ