fragginwagon/cf-memorypalace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Remove unnecessary blank lines in mergeConflictManager.js

Browse Source
This commit is contained in:
Greg Jacobs
2026-01-26 16:18:53 -05:00
parent f7d928506a
commit 28f66ea0b7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/oddsNends/mergeConflictManager.js
View File

@@ -41,7 +41,7 @@ for (let i = 0; i < commands.length; i++) {
} catch (error) { } catch (error) {
console.error(`\n✗ Failed at command: ${cmd}`); console.error(`\n✗ Failed at command: ${cmd}`);
console.error(`Exit code: ${error.status}`); console.error(`Exit code: ${error.status}`);
// If the merge command fails, open VS Code with the repository // If the merge command fails, open VS Code with the repository
if (cmd.startsWith('git merge')) { if (cmd.startsWith('git merge')) {
console.log(`\nOpening VS Code to resolve merge conflicts...`); 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'); console.error('Failed to open VS Code');
} }
} }
process.exit(1); process.exit(1);
} }
} }