Do you use git worktree?

MobileDevJapan #10
https://mobiledev-japan.connpass.com/event/376753/

Transcript

1. Do you use git worktree? U-NEXT CO., LTD. Android Developer みっちゃん（Mitchang） 1
2. Self-introduction • Name：みっちゃん（Mitchang） • Backgrounds： ◦ Android Engineer (4 years) ◦ U-NEXT (since Sep 2025) ◦ DroidKaigi staff ◦ I want to be able to speak English!! X（Twitter）: 🔗@mimimi_engineer 2
3. Have you ever used git worktree? 3
4. Do you have any of these problems Code review request comes in while you're coding. So you want to check it in your IDE, you have to git stash the current changes… You want to fix review comments of the pull-request for Issue A, while working on Issue B at the same time While you focus on your own task, you want AI to work on another task 4
5. Git worktree to the rescue!! 5
6. What is git worktree? That’s the feature lets you use a single Git repository with multiple working directories !! 6
7. ◆ Without git worktree • 1 Repo:１Working dir : 1 branch • if you want to check out another branch → you need to stash or commit What is git worktree? 7
8. ◆ With git worktree • You can create a separated directory for each branch • ex：dir A is for main branch, dir B is for feat/hoge branch What is git worktree? 8
9. How to use git worktree git worktree add [directory for the branch] [branch to check out] ex：git worktree add ../PickUpConnpassEvent-2 main 9 Successfully created a worktree for the main branch of the PickUpConnpassEvent repo in the PickUpConnpassEvent-2 dir!!
10. やり方 10 You can open different branches of the same project at the same time!!
11. Pros • Open different branches of the same repository in separate directories, so context switching is easier (depends on the person) • Work on multiple tasks in parallel • No need to stash changes when you do a code review! 11
12. Git Worktree: A Handy Tool 12
13. If you want to integrate with other editors or AI coding tool：git-worktree-runner A CLI tool that wraps complex git worktree commands for simple management • Instantly set up isolated development environments for each branch ◦ Easily create a worktree with gtr new <branch> • Seamless integration with editors and IDEs ◦ Open a branch’s worktree in VS Code or other editors with gtr editor <branch> ◦ It’s useful for people who want to switch editors based on their task or project • Integration with AI coding tools ◦ Launch AI coding agents like Cursor in the context of a specific branch with gtr ai <branch> ◦ Let AI work on one branch while you continue your own work on another 🔗 https://zenn.dev/masajiro/articles/db0e6123492ddc 13
14. There’s a JetBrains plugin for git worktree! 🔗 https://plugins.jetbrains.com/plugin/23813-git-worktree 14
15. Thank you for listening 15