@damper/cli 0.9.0 → 0.9.1
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/services/claude.js +12 -1
- package/package.json +1 -1
package/dist/services/claude.js
CHANGED
|
@@ -307,7 +307,18 @@ export async function postTaskFlow(options) {
|
|
|
307
307
|
console.log(pc.dim('Merging feature into main...'));
|
|
308
308
|
await execa('git', ['checkout', 'main'], { cwd: projectRoot, stdio: 'pipe' });
|
|
309
309
|
await execa('git', ['merge', currentBranch, '--no-edit'], { cwd: projectRoot, stdio: 'inherit' });
|
|
310
|
-
console.log(pc.green('✓ Merged to main locally
|
|
310
|
+
console.log(pc.green('✓ Merged to main locally'));
|
|
311
|
+
const shouldPush = await confirm({
|
|
312
|
+
message: 'Push main to origin?',
|
|
313
|
+
default: false,
|
|
314
|
+
});
|
|
315
|
+
if (shouldPush) {
|
|
316
|
+
await execa('git', ['push', 'origin', 'main'], { cwd: projectRoot, stdio: 'inherit' });
|
|
317
|
+
console.log(pc.green('✓ Pushed main to origin\n'));
|
|
318
|
+
}
|
|
319
|
+
else {
|
|
320
|
+
console.log(pc.dim('Skipped push. Run `git push origin main` when ready.\n'));
|
|
321
|
+
}
|
|
311
322
|
}
|
|
312
323
|
}
|
|
313
324
|
catch (err) {
|