Merge branch 'main' into worktree-docs

README.md

@@ -137,6 +137,21 @@ For example, when working with a local web server, you can use 'Restore Workspac
 
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
+<img align="left" width="360" src="https://github.com/user-attachments/assets/7fdf41e6-281a-4b4b-ac19-020b838b6970">
+
+### Worktrees: Parallel Development
+
+Worktrees let you work on multiple branches simultaneously, each in its own folder. This enables Cline to work on tasks in parallel across separate VS Code windows, or lets Cline work independently while you continue coding in your main workspace.
+
+Cline takes over your VS Code window while working on a task. With worktrees, you can:
+- **Run Cline in parallel** - Have Cline work on multiple tasks simultaneously
+- **Keep working while Cline works** - Let Cline handle a task in a separate worktree while you continue coding
+- **Isolate experimental changes** - Test risky changes in a worktree without affecting your main branch
+
+<!-- Transparent pixel to create line break after floating image -->
+
+<img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
+
 ## Contributing
 
 To contribute to the project, start with our [Contributing Guide](CONTRIBUTING.md) to learn the basics. You can also join our [Discord](https://discord.gg/cline) to chat with other contributors in the `#contributors` channel. If you're looking for full-time work, check out our open positions on our [careers page](https://cline.bot/join-us)!

docs/getting-started/your-first-project.mdx

@@ -103,8 +103,8 @@ Master planning vs. execution for complex tasks
 Set project-specific guidelines for consistent results
 </Card>
 
-<Card title="Prompting Guide" href="/prompting/prompt-engineering-guide" icon="wand-magic-sparkles">
-Learn to write prompts that get the best results
+<Card title="Worktrees" href="/features/worktrees" icon="git-branch">
+Work on multiple branches simultaneously with parallel Cline sessions
 </Card>
 </CardGroup>
 

docs/introduction/overview.mdx

@@ -99,6 +99,9 @@ Cline explores your codebase and works with you to create comprehensive plans be
       <div>
         <strong><a href="/features/dictation">Dictation</a></strong> • Speak naturally to Cline for rapid planning and complex requirements
       </div>
+      <div>
+        <strong><a href="/features/worktrees">Worktrees</a></strong> • Work on multiple branches simultaneously with parallel Cline sessions
+      </div>
     </div>
   </Accordion>
 
@@ -144,4 +147,3 @@ Cline explores your codebase and works with you to create comprehensive plans be
     See every file read, every decision considered, every token used. No black box, no surprises.
   </Card>
 </CardGroup>
-