[#4] 여러 repository에 적용 가능한 branch merge conflict 가능성 rule을 구성한다#14
Merged
Conversation
There was a problem hiding this comment.
Code Review
이번 PR은 브랜치 간 머지 충돌 가능성을 분석하여 점수 및 위험도를 산출하는 Risk Analyzer 모듈을 추가하고 관련 테스트와 README 문서를 작성했습니다. 코드 리뷰에서는 브랜치 쌍 비교 시 중복 연산을 제거하여 성능을 개선하는 방안과, 정규식 컴파일 오버헤드를 줄이기 위해 와일드카드 매칭 로직을 단순화하는 방안이 제안되었습니다.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
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.
🔗 연관된 이슈
🎯 의도
📝 작업 내용
📌 요약
GitMergeSignal과 branch metadata 기반 risk score/reason 계산 구성🔍 상세
src/risks/types.ts에BranchRisk,BranchRiskReason,BranchChangedHunk,BranchRiskAnalysisInput,BranchRiskAnalysisOptions타입 추가src/risks/riskAnalyzer.ts에analyzeBranchMergeRisks추가confirmed_conflictsignal을 score 100과criticalstatus로 처리merge_check_failedsignal을 medium risk reason으로 처리same_file_overlapreason 생성same_hunk_overlapreason 생성failed_checkreason으로 반영criticalFilePatterns설정으로 repository별 민감 파일 변경을critical_file_changedreason으로 반영clean_mergereason 생성low,medium,high,criticalstatus로 변환src/index.ts에서 risk analyzer API와 타입 exportREADME.md에 signal별 score와 status 구간 설명 추가tests/risks/riskAnalyzer.test.ts에 rule별 단위 테스트 추가npm run build,npm test,git diff --check검증📸 영상 / 이미지 (Optional)