๐Ÿ‘ฉ๐Ÿป‍๐Ÿ’ป Dev/GIT

Git Rebase ์ค‘ Husky ํ›… ๋ฌธ์ œ ํ•ด๊ฒฐํ•˜๊ธฐ

yesolz 2024. 10. 1. 15:49
728x90

git rebase๋ฅผ ์ง„ํ–‰ํ•˜๋‹ค ๋ณด๋ฉด prepare-commit-msg ํ›…์ด ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ํ˜•์‹์„ ๊ฒ€์‚ฌํ•˜๋Š” ๊ณผ์ •์—์„œ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ•  ์ˆ˜ ์žˆ๋‹ค.

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๊ฐ€ ์ •ํ•ด์ง„ ๊ทœ์น™์— ๋งž์ง€ ์•Š์œผ๋ฉด rebase๊ฐ€ ์ค‘๋‹จ๋˜๊ณ , ์•„๋ž˜์™€ ๊ฐ™์€ ๋ฉ”์‹œ์ง€๊ฐ€ ์ถœ๋ ฅ๋  ์ˆ˜ ์žˆ๋‹ค.

COMMIT REJECTED: { [api|web|infra] feat|fix|refactor|chore|test|docs|style|rename: commit ์ œ๋ชฉ } ์ œ์‹œ๋œ ํ˜•์‹์— ๋งž๊ฒŒ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”
husky - prepare-commit-msg hook exited with code 1 (error)
error: could not commit staged changes.

prepare-commit-msg๋ฅผ ๋˜ ์ˆ˜์ •ํ•˜์—ฌ ์ƒˆ๋กœ์šด ์ปค๋ฐ‹์„ ์ž‘์„ฑํ•˜๊ธฐ ๋ณด๋‹ค๋Š”,

rebase ์ค‘์— prepare-commit-msg ํ›…์„ ์ž„์‹œ๋กœ ๋น„ํ™œ์„ฑํ™”ํ•˜๋Š” ๋ฐฉ๋ฒ•์ด ํšจ๊ณผ์ ์ด๋‹ค.

 

1. ์ž„์‹œ๋กœ Husky ํ›… ๋น„ํ™œ์„ฑํ™”

HUSKY ํ™˜๊ฒฝ ๋ณ€์ˆ˜๋ฅผ ์„ค์ •ํ•˜์—ฌ ํ›…์„ ๋น„ํ™œ์„ฑํ™”ํ•œ ์ƒํƒœ๋กœ rebase๋ฅผ ์ง„ํ–‰ํ•  ์ˆ˜ ์žˆ๋‹ค. 

HUSKY=0 git rebase --continue

์ด ๋ช…๋ น์–ด๋Š” prepare-commit-msg ํ›…์„ ๊ฑด๋„ˆ๋›ฐ๊ณ  rebase๋ฅผ ์™„๋ฃŒํ•  ์ˆ˜ ์žˆ๊ฒŒ ํ•ด์ค€๋‹ค.

 

2. rebase ์™„๋ฃŒ ํ›„ ํ›… ํ™œ์„ฑํ™”

์œ„ ๋ฐฉ๋ฒ•์œผ๋กœ rebase๋ฅผ ์™„๋ฃŒํ•˜๋ฉด, ํ›…์€ ๋‹ค์‹œ ์ž๋™์œผ๋กœ ํ™œ์„ฑํ™”๋œ๋‹ค. ์ดํ›„ ์ปค๋ฐ‹ ์ž‘์—…์—์„œ๋Š” ๋‹ค์‹œ ํ›…์ด ์ •์ƒ์ ์œผ๋กœ ๋™์ž‘ํ•˜๊ฒŒ ๋œ๋‹ค.

728x90