Add worktrees and Zed guides

Author: maiertech

src/routes/guides/warp/+page.md

@@ -0,0 +1,6 @@
+---
+title: Warp guide
+description: How to use Warp to for code reviews and agent orchestration.
+---
+
+Test

src/routes/guides/worktrees/+page.md

@@ -0,0 +1,52 @@
+---
+title: Worktrees guide
+description: Manual Git worktree management.
+---
+
+[Warp](/guides/warp) recognizes worktrees but does not support managing them. [Zed](/guides/zed)
+supports worktree management but does not allow you to co-locate worktrees with the main repository.
+
+## Create a worktree
+
+I want the worktree to be co-located with my cloned repository. If the cloned repository is
+`path/to/website`, the worktrees should reside in `path/to/website.worktrees`. This is a convention
+that VS Code's worktree implementation uses and that I like better than a central `worktrees`
+directory.
+
+Suppose you need a worktree for issue 1234. Run:
+
+```bash
+git worktree add -b i-1234 ../website.worktrees/w-1234
+```
+
+to create branch `i-1234` in worktree `w-1234`.
+
+Suppose you need a worktree to review pull request 1173, which uses branch `i-1172`. Run:
+
+```bash
+git worktree add ../website.worktrees/r-1173 i-1172
+```
+
+Using `r-1173` instead of `w-1173` as the worktree name makes it clear that this worktree is for
+code review.
+
+## Worktree management
+
+Run:
+
+```bash
+git worktree list
+```
+
+in the main repository or in any derived worktree to list all worktrees. The worktree location above
+is just a convention. Worktrees can be anywhere.
+
+Run:
+
+```bash
+git worktree remove ../website.worktrees/w-1234
+```
+
+to remove a worktree.
+
+Alternatively, Zed has great worktree management.

src/routes/guides/zed/+page.md

@@ -1,6 +1,66 @@
 ---
-title: Zed
-description: My Zed editor setup.
+title: Zed guide
+description: How to use Zed for agentic coding.
 ---
 
-My Zed editor setup goes here.
+## Shortcuts
+
+| Shortcut | Description         |
+| :------- | :------------------ |
+| `⌘ B`    | Toggle left dock.   |
+| `⌘ R`    | Toggle right dock.  |
+| `⌘ ⇧ E`  | Show project panel. |
+| `⌘ ⇧ G`  | Show Git panel.     |
+| `⌘ ⇧ B`  | Show outline panel. |
+| `⌘ ?`    | Show agent panel.   |
+| `⌃ ⇧ R`  | Review changes.     |
+| `@`      | Add to context.     |
+
+## Worktrees
+
+Workspace isolation is done with Git [worktrees](/guides/worktrees). You can manage worktrees with
+`git: worktree`. This works well except for the creation of new worktrees. Zed thinks that all
+worktrees it creates should be located in one central (but customizable) directory. And it does not
+support creating worktrees from existing branches.
+
+## Orchestration
+
+Use one worktree per window. The UI is not designed to run multiple agents in parallel. You can do
+this with one window per agent, but there is no good way to manage all the running agents.
+
+## Code reviews
+
+### Review files changed by agent
+
+You can look at uncommitted changes with `git: diff`. You can stage or restore changes one by one,
+but that is usually not what you want. When there are uncommitted changes made by an agent, you will
+see the **Review changes** button. Alternatively, you can use the keyboard shortcut to open this
+view. In this view, you can accept or reject the agent's changes one by one.
+
+When you do this is up to you. You might do a few iterations with the agent without looking at the
+code and then review, or you might review changes in every iteration. You can also copy all the
+diffs and add them to your agent's context, or rather another agent's context, and let the agent do
+a code review.
+
+### Pull request review
+
+One downside of Zed is that it does not yet have anything that matches
+[GitHub's pull requests extension](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github).
+You have to find a different workflow to do pull requests.
+
+Since you can't create a worktree from the pull request branch in Zed, you need to create a worktree
+for the review manually. With `git: branch diff`, you can create a diff between the default branch
+on origin and the branch you are on. It is currently not possible to diff against another branch,
+for example when you stack pull requests.
+
+You can create a diff and send it to your current agent for a first review.
+
+Two more useful features for exploring the pull request are the Git graph and the file history,
+which you can access for each file with a right-click.
+
+A big downside is that you cannot write line comments during a pull request review in Zed. You need
+to switch context to the Git provider's website.
+
+## Resolve merge conflicts
+
+Zed has built-in merge conflict resolution (not tested yet).