From 4a20e8abd7c02f26a0ceeb14290e3807540d354a Mon Sep 17 00:00:00 2001 From: wendrul Date: Thu, 18 Dec 2025 15:03:34 +0100 Subject: [PATCH 1/6] Workspace forks (merge ui + cahngelog) --- changelog/2025-12-16-workspace-forks/index.md | 17 ++++++ .../11_git_sync/windmill_collaboration.mdx | 51 ++++++++++++++++++ docs/advanced/20_workspace_forks/index.mdx | 33 +++++++++--- static/videos/merge-ui-demo.mp4 | Bin 0 -> 1665721 bytes 4 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 changelog/2025-12-16-workspace-forks/index.md create mode 100644 docs/advanced/11_git_sync/windmill_collaboration.mdx create mode 100644 static/videos/merge-ui-demo.mp4 diff --git a/changelog/2025-12-16-workspace-forks/index.md b/changelog/2025-12-16-workspace-forks/index.md new file mode 100644 index 000000000..cb9247f47 --- /dev/null +++ b/changelog/2025-12-16-workspace-forks/index.md @@ -0,0 +1,17 @@ +--- +slug: workspace-forks +version: v1.593.0 +title: Workspace forks +tags: ['Workspaces'] +description: Create independent copies of workspaces for parallel development workflows, similar to git branches. Merge changes back to parent workspaces directly from the UI or through git sync. +features: + [ + 'Fork workspaces to create independent development environments', + 'Automatically create git branches when used with git sync', + 'Merge forked workspaces back to parent workspaces from the UI', + 'Multiple developers can work on separate forks simultaneously', + 'Deploy individual items to parent workspace using deployment UI' + ] +docs: /docs/advanced/workspace_forks +video: /videos/merge-ui-demo.mp4 +--- diff --git a/docs/advanced/11_git_sync/windmill_collaboration.mdx b/docs/advanced/11_git_sync/windmill_collaboration.mdx new file mode 100644 index 000000000..95601309a --- /dev/null +++ b/docs/advanced/11_git_sync/windmill_collaboration.mdx @@ -0,0 +1,51 @@ +import DocCard from '@site/src/components/DocCard'; + +# Collaborating on Windmill + +In windmill there are multiple ways to collaborate + +## Workspace forks + +The easiest and main way of collaborating on windmill is through the use of workspace forks. This feature lets users branch off of a workspace and have an exact copy where they can create new items or make changes, test them, and deploy them to the main workspace once it's all working. + +