Hello Kitty Eyes Shut
๋ณธ๋ฌธ ๋ฐ”๋กœ๊ฐ€๊ธฐ

๐Ÿ’ป Git

 (2)
[Git] Merge์™€ Squash and Merge์˜ ์ฐจ์ด์  ๋ชฉ์ฐจ (OPEN)๐Ÿ”€ Merge๐Ÿงผ Squash and Merge๐Ÿซ Merge VS Squash and Merge ์š”์•ฝ ๋น„๊ต ๐Ÿ”€ Merge๐Ÿ“Œ ์„ค๋ช…์ข€ ๋” ํ’€์–ด์„œ ๋งํ•˜๋ฉด Create a merge commit ๋ฐฉ์‹์œผ๋กœ,๋ธŒ๋žœ์น˜์—์„œ ์ž‘์—…ํ•œ ๋ชจ๋“  ์ปค๋ฐ‹ ๊ธฐ๋ก์„ ๊ทธ๋Œ€๋กœ ์œ ์ง€ํ•˜๋ฉด์„œ ๋ณ‘ํ•ฉํ•œ๋‹ค.๊ทธ๋ฆฌ๊ณ  ์ด๋•Œ, ๋ณ‘ํ•ฉ๊ณผ ํ•จ๊ป˜ merge commit์ด ํ•˜๋‚˜ ์ƒˆ๋กœ ๋งŒ๋“ค์–ด์ง„๋‹ค. ๐Ÿ“‹ ์˜ˆ์‹œ๋ธŒ๋žœ์น˜ feature/login ์—์„œ ์•„๋ž˜์™€ ๊ฐ™์ด ์ž‘์—…ํ–ˆ๋‹ค๊ณ  ํ•˜์ž.feat: ๋กœ๊ทธ์ธ ํผ ์ถ”๊ฐ€test: ๋กœ๊ทธ์ธ ์œ ๋‹› ํ…Œ์ŠคํŠธ ์ž‘์„ฑfix: ๋ฒ„ํŠผ ํด๋ฆญ ์˜ค๋ฅ˜ ์ˆ˜์ • Merge๋ฅผ ํ•˜๋ฉด main ๋ธŒ๋žœ์น˜์—๋Š” ์•„๋ž˜์™€ ๊ฐ™์ด ๋‚จ๊ฒŒ ๋œ๋‹ค.merge: feature/login ๋ณ‘ํ•ฉโ”ฃโ” feat: ๋กœ๊ทธ์ธ ํผ ์ถ”๊ฐ€โ”ฃโ” test: ๋กœ๊ทธ์ธ ์œ ๋‹› ํ…Œ์ŠคํŠธ ์ž‘์„ฑโ”—โ” fix..
[Git] .gitignore ์™„๋ฒฝ ๊ฐ€์ด๋“œ ๋ชฉ์ฐจ (OPEN) .gitignore๋ž€ Git์—์„œ .gitignore์˜ ์—ญํ•  .gitignore ํŒŒ์ผ ์ƒ์„ฑํ•˜๊ธฐ ํ„ฐ๋ฏธ๋„์—์„œ ์ง์ ‘ ์ƒ์„ฑํ•˜๋Š” ๋ฐฉ๋ฒ• IntelliJ IDEA์—์„œ ์ง์ ‘ ์ƒ์„ฑํ•˜๋Š” ๋ฐฉ๋ฒ• ์ž๋™ ์ƒ์„ฑ ์‚ฌ์ดํŠธ๋ฅผ ์ด์šฉํ•˜๋Š” ๋ฐฉ๋ฒ• (gitignore.io) .gitignore ๋ฌธ๋ฒ• ์ดํ•ดํ•˜๊ธฐ ์ฃผ์„ ํŠน์ • ํŒŒ์ผ / ๋””๋ ‰ํ† ๋ฆฌ ๋ฌด์‹œํ•˜๊ธฐ ํŒจํ„ด ๋งค์นญ .gitignore ์ ์šฉ ๋ฐฉ๋ฒ• ์ด๋ฏธ ์ปค๋ฐ‹๋œ ํŒŒ์ผ์— .gitignore ์ ์šฉํ•˜๊ธฐ ๊ธ€๋กœ๋ฒŒ .gitignore ์„ค์ •ํ•˜๊ธฐ .git..

ํ‹ฐ์Šคํ† ๋ฆฌํˆด๋ฐ”