(
dataSources: Array<{ source: MergerDataSource; filename: string }>
)
| 74 | // ==================== Conflict checking ==================== |
| 75 | |
| 76 | export function checkConflictsFromSources( |
| 77 | dataSources: Array<{ source: MergerDataSource; filename: string }> |
| 78 | ): ConflictCheckResult { |
| 79 | const allMessages: Array<{ msg: MergerMessage; source: string; platform: string }> = [] |
| 80 | |
| 81 | for (const { source, filename } of dataSources) { |
| 82 | const meta = source.getMeta() |
| 83 | const platform = meta?.platform || 'unknown' |
| 84 | source.streamMessages(10000, (messages) => { |
| 85 | for (const msg of messages) { |
| 86 | allMessages.push({ msg, source: filename, platform }) |
| 87 | } |
| 88 | }) |
| 89 | } |
| 90 | |
| 91 | return detectConflictsInMessages(allMessages) |
| 92 | } |
| 93 | |
| 94 | // ==================== Merge orchestration ==================== |
| 95 |
no test coverage detected