chore(ts): fix possible undefined value from updated config

mikais13 · mikais13 · commit c338c7f3cc18 · 2026-04-02T23:33:37.000-10:00
diff --git a/src/core/application/rebase.ts b/src/core/application/rebase.ts
@@ -184,7 +184,7 @@ function extractConflictingFiles(errorMessage: string): string[] {
 
 		// "CONFLICT (content|add/add): Merge conflict in <path>"
 		const mergeConflictMatch = line.match(/Merge conflict in (.+)$/);
-		if (mergeConflictMatch) {
+		if (mergeConflictMatch?.[1]) {
 			files.push(mergeConflictMatch[1].trim());
 			continue;
 		}

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ function extractConflictingFiles(errorMessage: string): string[] {`
`184`	`184`
`185`	`185`	`// "CONFLICT (content\|add/add): Merge conflict in <path>"`
`186`	`186`	`const mergeConflictMatch = line.match(/Merge conflict in (.+)$/);`
`187`		`- if (mergeConflictMatch) {`
	`187`	`+ if (mergeConflictMatch?.[1]) {`
`188`	`188`	`files.push(mergeConflictMatch[1].trim());`
`189`	`189`	`continue;`
`190`	`190`	`}`