Skip to content

ai: support worktrees in claude code#872

Open
ovitrif wants to merge 1 commit intomasterfrom
ai/worktreeinclude
Open

ai: support worktrees in claude code#872
ovitrif wants to merge 1 commit intomasterfrom
ai/worktreeinclude

Conversation

@ovitrif
Copy link
Copy Markdown
Collaborator

@ovitrif ovitrif commented Mar 27, 2026

This PR adds a .worktreeinclude file so Claude Code's claude -w worktree feature automatically copies build-critical gitignored files (signing keys, Firebase configs, local properties, Claude Code settings) into new worktrees.

Description

Defines gitignore-syntax patterns covering all gitignored files required for building and working with the project:

  • local.properties (SDK path, GitHub credentials)
  • keystore.* / *.keystore (signing configs and keystore binaries)
  • google-services.json (Firebase, all flavors)
  • *.local.* (Claude Code settings)
  • tools/fcm-tester/service-account.json

This replaces the need to manually maintain multiple repo copies (bitkit-android-2, -3) for parallel work.

Preview

N/A — config file only, no UI changes.

QA Notes

  1. Verify the file is tracked and patterns are correct
    • Run git ls-files --others --ignored --exclude-standard and confirm all critical files are listed
  2. Test worktree creation
    • Run claude -w from the repo root
    • Verify the new worktree contains copies of local.properties, app/google-services.json, keystore.properties, .claude/settings.local.json
  3. Verify worktree can build
    • In the new worktree, run ./gradlew compileDevDebugKotlin

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@claude
Copy link
Copy Markdown

claude bot commented Mar 27, 2026

Code review

No issues found. Checked for bugs and CLAUDE.md compliance.

@ovitrif ovitrif requested review from ben-kaufman and jvsena42 March 27, 2026 15:45
@ovitrif ovitrif added this to the 2.2.0 milestone Mar 27, 2026
@ovitrif ovitrif enabled auto-merge March 27, 2026 15:45
@ovitrif ovitrif self-assigned this Mar 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant