first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+15 -1
View File
@@ -15,8 +15,10 @@ crates/command-signatures-v2/js/node_modules
# For testing changes to the channel versions file
channel_versions_test.json
# Don't include any CPU profiling output by accident.
# Don't include any profiling output by accident.
profile.pb
*.mm_profdata
chrome_profiler.json
# Don't include any files that we write for testing purposes.
crates/warp_files/test_data/test_write
@@ -49,6 +51,15 @@ app/src/persistence/schema.rs.orig
# Don't include personal Claude Code settings
.claude/settings.local.json
# Don't include Claude Code worktrees
.claude/worktrees/
# Don't include Claude Code scheduled task lock
.claude/scheduled_tasks.lock
# Don't include ctags output
tags
# Tab drag development notes
pr_cleanup.md
desired_behavior.md
@@ -58,3 +69,6 @@ __pycache__/
# Local Warp upstream reference checkout (used by pull_warp_feature skill)
.galaxy/
# Project notes
.note/