@snapcommit/cli 3.9.7 → 3.9.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/repl.js +15 -0
- package/package.json +1 -1
package/dist/repl.js
CHANGED
|
@@ -126,6 +126,21 @@ async function startREPL() {
|
|
|
126
126
|
rl.close();
|
|
127
127
|
process.exit(0);
|
|
128
128
|
}
|
|
129
|
+
// Complete merge command (for manual conflict resolution)
|
|
130
|
+
if (line.toLowerCase().includes('complete') && line.toLowerCase().includes('merge')) {
|
|
131
|
+
try {
|
|
132
|
+
const { execSync } = await Promise.resolve().then(() => __importStar(require('child_process')));
|
|
133
|
+
execSync('git add -A', { encoding: 'utf-8', stdio: 'pipe' });
|
|
134
|
+
execSync('git commit --no-edit', { encoding: 'utf-8', stdio: 'pipe' });
|
|
135
|
+
console.log(chalk_1.default.green('\n✓ Merge completed successfully!\n'));
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
console.log(chalk_1.default.red(`\n❌ Failed to complete merge: ${error.message}\n`));
|
|
139
|
+
console.log(chalk_1.default.yellow('Make sure all conflicts are resolved and files are saved.\n'));
|
|
140
|
+
}
|
|
141
|
+
rl.prompt();
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
129
144
|
// Login command (NEW!)
|
|
130
145
|
if (line === 'login' || line === 'log in') {
|
|
131
146
|
console.log(chalk_1.default.yellow('\n⚠️ Please exit snap first (type: ') + chalk_1.default.cyan('exit') + chalk_1.default.yellow(')'));
|