fix: Remove unnecessary blank lines in mergeConflictManager.js
This commit is contained in:
@@ -41,7 +41,7 @@ for (let i = 0; i < commands.length; i++) {
|
||||
} catch (error) {
|
||||
console.error(`\n✗ Failed at command: ${cmd}`);
|
||||
console.error(`Exit code: ${error.status}`);
|
||||
|
||||
|
||||
// If the merge command fails, open VS Code with the repository
|
||||
if (cmd.startsWith('git merge')) {
|
||||
console.log(`\nOpening VS Code to resolve merge conflicts...`);
|
||||
@@ -51,7 +51,7 @@ for (let i = 0; i < commands.length; i++) {
|
||||
console.error('Failed to open VS Code');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user