๋ณธ๋ฌธ ๋ฐ”๋กœ๊ฐ€๊ธฐ
CLI ํ™˜๊ฒฝ์—์„œ Git ์‚ฌ์šฉํ•˜๊ธฐ(๋ช…๋ น์–ด ์ •๋ฆฌ) #2 CLI ํ™˜๊ฒฝ์—์„œ Git ์‚ฌ์šฉํ•˜๊ธฐ(๋ช…๋ น์–ด ์ •๋ฆฌ) #2 ๐Ÿ“ ๋ชฉ๋ก stash merge rebase pull request show reset cherry-pick stash - stash ๋œป: (์•ˆ์ „ํ•œ ๊ณณ์—) ๋„ฃ์–ด ๋‘๋‹ค. - ์ž‘์—…ํ•˜๋˜ ๋‚ด์šฉ(commit ํ•˜๊ธฐ ์ „์˜ modified, staged ์ƒํƒœ์˜ ํŒŒ์ผ๋“ค)์„ ์ž„์‹œ ์ €์žฅ - ๋ธŒ๋žœ์น˜์—์„œ ์ž‘์—…ํ•˜๋‹ค๊ฐ€ ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜๋กœ ๋ณ€๊ฒฝํ•ด์•ผ ํ•˜๋Š”๋ฐ ์ปค๋ฐ‹์€ ํ•˜๊ณ  ์‹ถ์ง€ ์•Š์€ ๊ฒฝ์šฐ ์‚ฌ์šฉ - stack์ฒ˜๋Ÿผ ์ž‘๋™(stash, pop) stash ์‚ฌ์šฉ ๋ฐฉ๋ฒ• git stash ํ˜„์žฌ ์ž‘์—…ํ•˜๋˜ ํŒŒ์ผ์„ ์ž„์‹œ ์ €์žฅ ์ด ๋ช…๋ น์–ด๋ฅผ ์ž…๋ ฅํ•œ ์ƒํƒœ์—์„œ status๋กœ ํ™•์ธํ•ด๋ณด๋ฉด ๋ณ€๊ฒฝ ์‚ฌํ•ญ์— ๋Œ€ํ•ด commit์„ ํ•˜์ง€ ์•Š์•˜์ง€๋งŒ working tree clean ๋ฉ”์‹œ์ง€๊ฐ€ ์ถœ๋ ฅ๋œ๋‹ค. stash๋กœ ์ž„์‹œ ์ €์žฅ๋œ ๋ชฉ๋ก ํ™•์ธ.. 2020. 8. 6.
CLI ํ™˜๊ฒฝ์—์„œ Git ์‚ฌ์šฉํ•˜๊ธฐ(๋ช…๋ น์–ด ์ •๋ฆฌ) #1 CLI ํ™˜๊ฒฝ์—์„œ Git ์‚ฌ์šฉํ•˜๊ธฐ(๋ช…๋ น์–ด ์ •๋ฆฌ) #1 ๐Ÿ“ ๋ชฉ๋ก status log add commit branch checkout push pull fetch status - ํ˜„์žฌ git ์ƒํƒœ๋ฅผ ๋ณด์—ฌ์คŒ - ๋‹ค์Œ 4๊ฐ€์ง€๋กœ ๊ตฌ๋ถ„๋˜์–ด ์ถœ๋ ฅ๋จ 1) Untracked files 2) Changes to be committed 3) Changes not staged for commit 4) Nothing to commit, working tree clean 1) Untracked files - Untracked ์ƒํƒœ์˜ ํŒŒ์ผ๋“ค - Git์— ์˜ํ•ด ๊ด€๋ฆฌ๋˜์ง€ ์•Š๋Š” ํŒŒ์ผ๋“ค - add ๋ช…๋ น์–ด๊ฐ€ ์ ์šฉ๋˜๊ธฐ ์ „์˜ ํŒŒ์ผ๋“ค - ex) ์‹ ๊ทœ ํŒŒ์ผ 2) Changes to be committed - Staged ์ƒํƒœ์˜ ํŒŒ์ผ๋“ค - Untra.. 2020. 8. 5.
[IntelliJ] VCS(Git) ์‚ฌ์šฉ ์‹œ ๋Š๋ฆผ, ๋ฉˆ์ถค ํ˜„์ƒ ์กฐ์น˜ ๋ฐฉ๋ฒ• [IntelliJ] VCS(Git) ์‚ฌ์šฉ ์‹œ ๋Š๋ฆผ, ๋ฉˆ์ถค ํ˜„์ƒ ์กฐ์น˜ ๋ฐฉ๋ฒ• ์ธํ…”๋ฆฌJ๋ฅผ ์‚ฌ์šฉํ•˜๋‹ค๋ณด๋ฉด ์ข…์ข… Git๊ฐ™์€ VCS๋ฅผ ์‚ฌ์šฉํ• ๋•Œ ๊ด€๋ จ ์ž‘์—…์ด ๋„ˆ๋ฌด ์˜ค๋ž˜ ๊ฑธ๋ฆฌ๊ฑฐ๋‚˜ ๋ฌดํ•œ ๋กœ๋”ฉ์— ๋น ์งˆ๋•Œ๊ฐ€ ์žˆ๋‹ค. ์ผ๋‹จ Cancel/Skip์„ ๋ˆŒ๋Ÿฌ ์ž‘์—…์„ ์ทจ์†Œํ•˜๊ณ  ์•„๋ž˜ ์กฐ์น˜ ๋ฐฉ์•ˆ๋“ค์„ ํ•˜๋‚˜์”ฉ ํ•ด๋ณด๋ฉด์„œ VCS ์ž‘์—…์„ ๋‹ค์‹œ ์‹œ๋„ํ•ด๋ณด์ž. 1. Invalidate Caches and Restart File - Invalidate Caches / Restart... ํด๋ฆญ Invalidate and Restart ํด๋ฆญ 2. VCS - Refresh File Status ํ”„๋กœ์ ํŠธ ๋ฃจํŠธ๋ฅผ ์„ ํƒํ•œ ์ƒํƒœ์—์„œ VCS - Refresh File Status๋ฅผ ํด๋ฆญํ•œ๋‹ค. 3. IntelliJ VCS Log ์‚ญ์ œ ์•„๋ž˜ ๋””๋ ‰ํ† ๋ฆฌ ํ•˜์œ„์˜ ํŒŒ์ผ๋“ค์„ ์‚ญ์ œํ•œ๋‹ค... 2020. 3. 16.
[Git] Git Bash ์‚ฌ์šฉ ๋ฐฉ๋ฒ• - init, status, add, commit, log [Git] Git Bash ์‚ฌ์šฉ ๋ฐฉ๋ฒ• - init, status, add, commit, log Git์„ ์‚ฌ์šฉํ•˜๋ ค๋ฉด ์‚ฌ์šฉํ•˜๋Š” ํ”Œ๋žซํผ์— ๋งž๋Š” git์„ ๋‹ค์šด๋กœ๋“œ๋ฐ›๊ณ  ์„ค์น˜ํ•ด์•ผํ•œ๋‹ค. ์œˆ๋„์šฐ์— git์„ ์„ค์น˜ํ•˜๋ ค๋ฉด ๋‹ค์Œ ํฌ์ŠคํŠธ๋ฅผ ์ฐธ๊ณ ํ•œ๋‹ค. - ์œˆ๋„์šฐ์šฉ Git ๋‹ค์šด๋กœ๋“œ ๋ฐ ์„ค์น˜ํ•˜๊ธฐ - ์„ค์น˜ ์˜ต์…˜์— ๋Œ€ํ•œ ์ž์„ธํ•œ ์„ค๋ช… ํฌํ•จ 1. Git ์ €์žฅ์†Œ ๋งŒ๋“ค๊ธฐ - git init ๋‹ค์Œ ์ค‘ ํ•œ ๊ฐ€์ง€ ๋ฐฉ๋ฒ•์œผ๋กœ Git ์ €์žฅ์†Œ๋ฅผ ๋งŒ๋“ค์ˆ˜ ์žˆ๋‹ค. ์•„์ง ๋ฒ„์ „๊ด€๋ฆฌ๋ฅผ ํ•˜์ง€ ์•Š๋Š” ๋กœ์ปฌ ๋””๋ ‰ํ† ๋ฆฌ ํ•˜๋‚˜๋ฅผ ์„ ํƒํ•ด์„œ Git ์ €์žฅ์†Œ๋ฅผ ์ ์šฉํ•˜๋Š” ๋ฐฉ๋ฒ• ๋‹ค๋ฅธ ์–ด๋”˜๊ฐ€์—์„œ Git ์ €์žฅ์†Œ๋ฅผ Clone ํ•˜๋Š” ๋ฐฉ๋ฒ• ์—ฌ๊ธฐ์„œ๋Š” ๊ธฐ์กด์˜ ๋กœ์ปฌ ๋””๋ ‰ํ† ๋ฆฌ๋ฅผ git ์ €์žฅ์†Œ๋กœ ๋งŒ๋“œ๋Š” ๋ฐฉ๋ฒ•์„ ์•Œ์•„๋ณธ๋‹ค. Git ์ €์žฅ์†Œ๋กœ ๋งŒ๋“ค ํด๋”๋กœ ์ด๋™ํ•ด์„œ ๋งˆ์šฐ์Šค ์šฐ์ธก ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด๊ณ  Git Bash He.. 2020. 3. 4.
IntelliJ์—์„œ Git/GitHub ์‚ฌ์šฉํ•˜๊ธฐ - ๊ธฐ์กด ํ”„๋กœ์ ํŠธ ์—ฐ๋™ํ•˜๊ธฐ GitHub์— ์ƒˆ๋กœ์šด remote repository๋ฅผ ๋งŒ๋“ค๊ณ  ๊ธฐ์กด IntelliJ ํ”„๋กœ์ ํŠธ(๋ชจ๋“ˆ)์„ ์—ฐ๋™ํ•˜๋Š” ๋ฐฉ๋ฒ•์— ๋Œ€ํ•ด ๋‹ค๋ฃฌ๋‹ค. IntelliJ๋Š” 2019.3 ๋ฒ„์ „์„ ๊ธฐ์ค€์œผ๋กœ ํ•œ๋‹ค. ๊ณผ์ •์€ ๋‹ค์Œ ์ˆœ์„œ๋กœ ์ง„ํ–‰๋œ๋‹ค. GitHub remote repository ์ƒ์„ฑํ•˜๊ธฐ IntelliJ์— GitHub ๊ณ„์ • ๋“ฑ๋กํ•˜๊ธฐ IntelliJ์— remote repository ๋“ฑ๋กํ•˜๊ธฐ ๊ธฐ์กด ํ”„๋กœ์ ํŠธ(๋ชจ๋“ˆ)๋กœ Git local repository๋ฅผ ๋งŒ๋“ค๊ณ  Commit, Push IntelliJ์—์„œ Git์„ ์‚ฌ์šฉํ•˜๋ ค๋ฉด PC์— Git์„ ์„ค์น˜ํ•˜๊ณ  Git ๋ฐ”์ด๋„ˆ๋ฆฌ ํŒŒ์ผ์„ IntelliJ์— ๋“ฑ๋กํ•ด์•ผ ํ•œ๋‹ค. ์ด๊ฒŒ ๋˜์–ด์žˆ์ง€ ์•Š์œผ๋ฉด ๋‹ค์Œ ๋‚ด์šฉ์„ ์ฐธ๊ณ ํ•ด์„œ ์„ ํ–‰ํ•ด๋‘์–ด์•ผ ํ•œ๋‹ค. Git ํ”Œ๋Ÿฌ๊ทธ์ธ ํ™•์ธ Settings - Plugins์—์„œ ์„ค.. 2020. 2. 17.