fix(git): clean up in-progress merge/rebase banner

Use the real status-warning tokens (--status-warning-bg did not exist, so
the card rendered without a fill), drop the decorative icons, and fold the
conflict count into the title as a single full-message key per locale.
The operation description now wraps instead of truncating, and both the
conflict and ready-to-continue states share the same action layout.

packages/ui/src/lib/i18n/messages/ko.ts

@@ -834,12 +834,15 @@ export const dict: Record<I18nKey, string> = {
   'gitView.operation.abort': '중단',
   'gitView.operation.continue': '계속',
   'gitView.operation.inProgressTitle': '{operation} 진행 중',
+  'gitView.operation.inProgressTitleManyConflicts': '{operation} 진행 중: 충돌 {count}개',
+  'gitView.operation.inProgressTitleOneConflict': '{operation} 진행 중: 충돌 {count}개',
   'gitView.operation.merge': '병합',
   'gitView.operation.mergeInProgressWithHead': '{head} 병합 진행 중',
   'gitView.operation.mergingMessage': '병합 중: {message}',
   'gitView.operation.rebase': '리베이스',
   'gitView.operation.rebaseInProgress': '리베이스 진행 중',
   'gitView.operation.rebasingOnto': '{headName}을(를) {onto} 위로 리베이스 중',
+  'gitView.operation.readyToContinueHint': '모든 충돌이 해결되었습니다. 계속하여 작업을 완료하세요.',
   'gitView.operation.resolveConflictsHint': '충돌을 해결한 뒤 작업을 계속하세요.',
   'gitView.operation.resolveWithAi': 'AI로 해결',
   'gitView.stash.confirmButton': '확인',