Skip to content

๐Ÿšซ main develop ๋ธŒ๋žœ์น˜์— ์ง์ ‘ push ๊ธˆ์ง€ ์•ˆ๋‚ด

Seolin(Kirby) edited this page Jul 14, 2025 · 1 revision

๐Ÿ“Œ ๋ณ€๊ฒฝ ์‚ฌํ•ญ

main, develop ๋ธŒ๋žœ์น˜์—๋Š” PR(Pull Request) ์—†์ด ์ง์ ‘ push๊ฐ€ ๋ถˆ๊ฐ€๋Šฅํ•˜๋„๋ก ๋ณดํ˜ธ ๊ทœ์น™์ด ์ ์šฉ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.
์ด์ œ๋ถ€ํ„ฐ๋Š” ๋ชจ๋“  ๋ณ€๊ฒฝ ์‚ฌํ•ญ์€ Pull Request๋ฅผ ํ†ตํ•ด์„œ๋งŒ ๋ณ‘ํ•ฉํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.

๐Ÿงฑ ์ ์šฉ๋œ ๋ณดํ˜ธ ๊ทœ์น™ ์š”์•ฝ

ํ•ญ๋ชฉ ์ ์šฉ ๋‚ด์šฉ
๋Œ€์ƒ ๋ธŒ๋žœ์น˜ main, develop
์ง์ ‘ push (git push) โŒ ๊ธˆ์ง€๋จ
๊ฐ•์ œ push (--force) โŒ ๊ธˆ์ง€๋จ
๋ธŒ๋žœ์น˜ ์‚ญ์ œ โŒ ๊ธˆ์ง€๋จ
PR ์Šน์ธ ํ•„์š” โœ… ์ตœ์†Œ 1์ธ ์ด์ƒ์˜ Review ์Šน์ธ ํ•„์š”
๋ณ‘ํ•ฉ ๋ฐฉ์‹ Merge, Squash, Rebase ๊ฐ€๋Šฅ

โœ… ์ž์œ ๋กญ๊ฒŒ ์ž‘์—… ๊ฐ€๋Šฅํ•œ ๋ธŒ๋žœ์น˜

feature/, bugfix/, hotfix/ ๋“ฑ์˜ ๋ธŒ๋žœ์น˜์—๋Š” ํ˜„์žฌ ๋ธŒ๋žœ์น˜ ๋ณดํ˜ธ ๊ทœ์น™์ด ์ ์šฉ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค.
๋”ฐ๋ผ์„œ ๋‹ค์Œ ์ž‘์—…์€ ์ž์œ ๋กญ๊ฒŒ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค:

  • ์ง์ ‘ ์ปค๋ฐ‹
  • ์ง์ ‘ push
  • ๊ฐ•์ œ push (--force)๋„ ํ˜„์žฌ๋Š” ๊ฐ€๋Šฅ (โš ๏ธ ๋น„์ถ”์ฒœ)

ํŒ€ ๋‚ด ๊ทœ์น™์— ๋”ฐ๋ผ ์ถ”ํ›„ ๋ณ„๋„์˜ ๋ณดํ˜ธ ๊ทœ์น™์ด ์ ์šฉ๋  ์ˆ˜๋„ ์žˆ์Šต๋‹ˆ๋‹ค.

โœ… ๊ถŒ์žฅ ์ž‘์—… ํ๋ฆ„

# 1. ๊ธฐ๋Šฅ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
git checkout -b feature/login-ui

# 2. ์ž‘์—… ๋ฐ ์ปค๋ฐ‹
git commit -m "โœจ Feat. ๋กœ๊ทธ์ธ ํ™”๋ฉด UI ๊ตฌ์„ฑ"

# 3. ์ปค๋ฐ‹ ํ‘ธ์‹œ
git push origin feature/login-ui

# 4. GitHub์—์„œ PR ์ƒ์„ฑ

PR์—๋Š” ์ž๋™์œผ๋กœ main ๋˜๋Š” develop์„ ๊ธฐ์ค€์œผ๋กœ ๋จธ์ง€๋˜๋ฉฐ, ๋ฆฌ๋ทฐ ์Šน์ธ ํ›„ ๋ณ‘ํ•ฉํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.

๐Ÿงจ Push ์‹คํŒจ ์˜ˆ์‹œ

git push
remote: error: GH013: Repository rule violations found for refs/heads/develop.
remote: - Changes must be made through a pull request.
! [remote rejected] develop -> develop (push declined due to repository rule violations)

์ด ๋ฉ”์‹œ์ง€๊ฐ€ ๋œจ๋ฉด, PR ์—†์ด main/develop ๋ธŒ๋žœ์น˜์— pushํ•˜๋ ค๊ณ  ํ•œ ๊ฒƒ์ด๋ฏ€๋กœ
โ†’ ์ž‘์—… ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ค๊ณ  PR์„ ํ†ตํ•ด ๋ฐ˜์˜ํ•ด์ฃผ์„ธ์š”!

๐Ÿ“Ž ์ฐธ๊ณ  ๋งํฌ

๐Ÿ”— GitHub ๋ธŒ๋žœ์น˜ ๋ณดํ˜ธ ๊ทœ์น™ ๋ณด๊ธฐ:
๐Ÿ‘‰ ํ•ด๋‹น ์ €์žฅ์†Œ Branch Rules ๋ณด๊ธฐ