agent-bot/takt
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Try Merge を squash merge に変更

Browse Source 
変更をステージするだけでコミットしないように変更。
git status で確認し、git commit で確定、git reset で取り消し可能。
This commit is contained in:
nrslib 2026-01-29 01:47:31 +09:00
parent 1339e2530f
commit 848522f7a9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/reviewTasks.ts
View File

@ -95,7 +95,7 @@ async function showDiffAndPromptAction(
[ [
{ label: 'View diff', value: 'diff', description: 'Show full diff in pager' }, { label: 'View diff', value: 'diff', description: 'Show full diff in pager' },
{ label: 'Instruct', value: 'instruct', description: 'Give additional instructions to modify this worktree' }, { label: 'Instruct', value: 'instruct', description: 'Give additional instructions to modify this worktree' },
{ label: 'Try merge', value: 'try', description: 'Merge without cleanup (keep worktree & branch)' }, { label: 'Try merge', value: 'try', description: 'Squash merge (stage changes without commit)' },
{ label: 'Merge & cleanup', value: 'merge', description: 'Merge (if needed) and remove worktree & branch' }, { label: 'Merge & cleanup', value: 'merge', description: 'Merge (if needed) and remove worktree & branch' },
{ label: 'Delete', value: 'delete', description: 'Discard changes, remove worktree and branch' }, { label: 'Delete', value: 'delete', description: 'Discard changes, remove worktree and branch' },
], ],
@ -105,27 +105,29 @@ async function showDiffAndPromptAction(
} }
/** /**
* Try-merge: merge the branch without cleanup. * Try-merge (squash): stage changes from branch without committing.
* Keeps the worktree and branch intact for further review. * Keeps the worktree and branch intact for further review.
* User can inspect staged changes and commit manually if satisfied.
*/ */
export function tryMergeWorktreeBranch(projectDir: string, item: WorktreeReviewItem): boolean { export function tryMergeWorktreeBranch(projectDir: string, item: WorktreeReviewItem): boolean {
const { branch } = item.info; const { branch } = item.info;
try { try {
execFileSync('git', ['merge', branch], { execFileSync('git', ['merge', '--squash', branch], {
cwd: projectDir, cwd: projectDir,
encoding: 'utf-8', encoding: 'utf-8',
stdio: 'pipe', stdio: 'pipe',
}); });
success(`Merged ${branch} (worktree kept)`); success(`Squash-merged ${branch} (changes staged, not committed)`);
log.info('Try-merge completed', { branch }); info('Run `git status` to see staged changes, `git commit` to finalize, or `git reset` to undo.');
log.info('Try-merge (squash) completed', { branch });
return true; return true;
} catch (err) { } catch (err) {
const msg = err instanceof Error ? err.message : String(err); const msg = err instanceof Error ? err.message : String(err);
logError(`Merge failed: ${msg}`); logError(`Squash merge failed: ${msg}`);
logError('You may need to resolve conflicts manually.'); logError('You may need to resolve conflicts manually.');
log.error('Try-merge failed', { branch, error: msg }); log.error('Try-merge (squash) failed', { branch, error: msg });
return false; return false;
} }
} }