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

Merge pull request #394 from nrslib/rename-sync-with-root

Browse Source 
Rename 'Sync with root' to 'Merge from root'
This commit is contained in:
nrs 2026-02-26 11:20:38 +09:00 committed by GitHub
parent e47a1ebb47
commit 61f0be34b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/cli-reference.ja.md
View File

@ -177,7 +177,7 @@ takt list --non-interactive --action delete --branch takt/my-branch --yes
takt list --non-interactive --format json
```
インタラクティブモードでは **Sync with root** を選択でき、ルートリポジトリの HEAD をワークツリーブランチにマージします。コンフリクト発生時は AI が自動解決を試みます。
インタラクティブモードでは **Merge from root** を選択でき、ルートリポジトリの HEAD をワークツリーブランチにマージします。コンフリクト発生時は AI が自動解決を試みます。
### タスクディレクトリワークフロー（作成 / 実行 / 確認）

4
docs/cli-reference.md
View File

@ -164,7 +164,7 @@ takt watch
### takt list
List task branches and perform actions (merge, delete, sync with root, etc.).
List task branches and perform actions (merge, delete, merge from root, etc.).
```bash
# List task branches (merge/delete)
@ -177,7 +177,7 @@ takt list --non-interactive --action delete --branch takt/my-branch --yes
takt list --non-interactive --format json
```
In interactive mode, **Sync with root** merges the root repository HEAD into the worktree branch with AI-assisted conflict resolution.
In interactive mode, **Merge from root** merges the root repository HEAD into the worktree branch with AI-assisted conflict resolution.
### Task Directory Workflow (Create / Run / Verify)

2
src/features/tasks/list/taskDiffActions.ts
View File

@ -66,7 +66,7 @@ export async function showDiffAndPromptActionForTask(
[
{ label: 'View diff', value: 'diff', description: 'Show full diff in pager' },
{ label: 'Instruct', value: 'instruct', description: 'Craft additional instructions and requeue this task' },
{ label: 'Sync with root', value: 'sync', description: 'Merge root HEAD into worktree branch; auto-resolve conflicts with AI' },
{ label: 'Merge from root', value: 'sync', description: 'Merge root HEAD into worktree branch; auto-resolve conflicts with AI' },
{ label: 'Try merge', value: 'try', description: 'Squash merge (stage changes without commit)' },
{ label: 'Merge & cleanup', value: 'merge', description: 'Merge and delete branch' },
{ label: 'Delete', value: 'delete', description: 'Discard changes, delete branch' },