chore: 트렁크 기반 개발로 전환 - #236
Merged
Merged
Conversation
dev/main 두 장수 branch를 cherry-pick으로 동기화하던 방식이 계속 내용 불일치(cherry-pick hell)를 낳아 폐기한다. main을 유일한 trunk로 삼고, 모든 작업은 main에서 분기한 짧은 수명 feature branch로 진행한다. dev-ci.yml/dev-cd.yml은 AWS CodeDeploy/EC2 기준으로 작성된 워크플로인데 실제로는 더 이상 배포에 쓰이지 않는 죽은 파일이라 (staging은 Render가 담당) 함께 제거했다.
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This was referenced Aug 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
작업 배경
dev/main두 장수(long-lived) branch를 cherry-pick으로 동기화하는 방식이 계속 내용 불일치(cherry-pick hell — 같은 논리적 변경이 다른 해시로 양쪽에 중복 존재)를 낳아왔다. 실무에서 가장 널리 쓰이는 Trunk-Based Development로 전환한다.변경 사항
README.md.github/workflows/dev-ci.yml,dev-cd.yml영향 범위
dev→main으로 변경devbranch 삭제dev→main으로 변경 (대시보드 작업이라 직접 못 함)Test Plan
grep으로 CODEOWNERS/다른 workflow에 dev 참조 없음 확인)🤖 Generated with Claude Code