Skip to content

Commit

Permalink
Adds a note about pulling a branch that doesn't exist.
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonbrowndotje
simonbrowndotje committed Oct 9, 2024
1 parent 9791273 commit b1ab5a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion cloud/15-workspace-branches.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ There are a couple of ways to create a branch:
- Branches are only viewable via the authenticated workspace URLs that start `/workspace` (i.e. they are not available via the unauthenticated `/share` URLs).
- Diagram thumbnails are not stored for branches.
- Branches are not included in the search index.
- There are no built-in facilities to merge, rebase, or diff branches. Instead, it's recommended that you create your workspace "as code" and use the facilities provided by your version control system.
- There are no built-in facilities to merge, rebase, or diff branches. Instead, it's recommended that you create your workspace "as code" and use the facilities provided by your version control system.
- Pulling a branch via the workspace API that doesn't exist will return the latest version of the main branch. This provides an easy way to retain manual layout information when creating a new branch.
3 changes: 2 additions & 1 deletion onpremises/10-workspace-branches.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ There are a couple of ways to create a branch:
- Branches are only viewable via the authenticated workspace URLs that start `/workspace` (i.e. they are not available via the unauthenticated `/share` URLs).
- Diagram thumbnails are not stored for branches.
- Branches are not included in the search index.
- There are no built-in facilities to merge, rebase, or diff branches. Instead, it's recommended that you create your workspace "as code" and use the facilities provided by your version control system.
- There are no built-in facilities to merge, rebase, or diff branches. Instead, it's recommended that you create your workspace "as code" and use the facilities provided by your version control system.
- Pulling a branch via the workspace API that doesn't exist will return the latest version of the main branch. This provides an easy way to retain manual layout information when creating a new branch.

1 comment on commit b1ab5a1

@chris-core
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Simon, this is a very interesting feature and as it seems this is still under development, assume documentation is still being built. Quick question if you have a moment, is there any functionality (existing or planned) to be able to specify the branch name to use when embedding the interactive iframed diagram? Thanks for your work on structurizr!

Please sign in to comment.