Conversation
Closed
DaleSeo
reviewed
Apr 8, 2026
hyoseong1994
reviewed
Apr 9, 2026
DaleSeo
reviewed
Apr 10, 2026
Member
DaleSeo
left a comment
There was a problem hiding this comment.
@RiaOh 님, 다음과 같이 차근차근 한 번 리베이스 해보시겠어요? 현재 상태로 병합하면 나중에 커밋 히스토리를 보기가 너무 힘들어질 것 같고, 릴리즈 노트 자동 생성할 때도 문제가 될 것 같습니다.
# 1. 최신 main 브랜치를 먼저 가져옵니다
git fetch origin main
# 2. main 브랜치 기준으로 interactive rebase를 시작합니다
# 에디터가 열리면 남길 커밋만 pick하고, 중복 커밋은 drop합니다
git rebase -i origin/main
# 3. 에디터에서 아래와 같이 정리합니다
# (중복/불필요한 커밋은 drop으로 변경)
#
# pick e521802 feat: add padding prop in layout components
# pick 69092f0 refactor: integration interface comment
# pick 74d6461 fix: remove padding prop in interface
#
# ⚠️ 아래 커밋들은 drop합니다:
# - cad1107 (e521802와 중복)
# - 84f146b (merge 커밋)
# - 8754526 (d9e8cf3/69092f0과 중복)
# - a5e24c6 (다른 분의 codecov 커밋 — main에 이미 있음)
# - d9e8cf3 (69092f0과 중복)
# 4. 충돌이 발생하면 해결 후 계속 진행합니다
# git add .
# git rebase --continue
#
# rebase를 취소하고 싶다면:
# git rebase --abort
# 5. rebase가 완료되면 force-push로 원격 브랜치를 교체합니다
# ⚠️ --force-with-lease는 다른 사람이 push한 변경을 덮어쓰지 않도록 보호해줍니다
git push --force-with-lease origin layout-component-padding-prop74d6461 to
2cc227b
Compare
Contributor
Author
달레님! 리베이스관련 설명 감사합니다~! |
2cc227b to
d075a92
Compare
hyoseong1994
approved these changes
Apr 18, 2026
SimYunSup
approved these changes
Apr 18, 2026
Member
|
@RiaOh 님, PR이 승인되었는데 별 다른 이유없이 너무 오래 열려있는 것 같아서 제가 병합하겠습니다! |
Contributor
Author
|
@DaleSeo 네, 병합해주셔서 감사합니다! |
Merged
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.
테스팅
체크 리스트