From 7cd678fabc58f90324d3e2c887c906030b46e697 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:04:51 +0000 Subject: [PATCH 1/7] add info on hiding deleted branches in IDE this pr adds missing info on whether you can hide deleted branches in the IDE and how to do this. this is prompted by [slack convo](https://getdbt.slack.com/archives/C03SAHKKG2Z/p1705915752893289?thread_ts=1705909300.509169&cid=C03SAHKKG2Z) --- .../docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index 2038d4ad64c..510574faab8 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -57,9 +57,10 @@ The IDE features some delightful tools and layouts to make it easier for you to 2. **Save button —** The editor has a **Save** button that saves editable files. Pressing the button or using the Command-S or Control-S shortcut saves the file contents. You don't need to save to preview code results in the Console section, but it's necessary before changes appear in a dbt invocation. The File Editor tab shows a blue icon for unsaved changes. -3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. The dropdown menu on the Git actions button allows users to revert changes, refresh git state, create merge/pull requests, and change branches. You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). - - - **Version Control Options menu —** Below the Git Actions button, the **Changes** section, which lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu. +3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. + - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. Keep in mind, you can't delete branches from the remote branches directly using this menu. However, if you [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus:~:text=change%20their%20branch.-,IDE%20Options%20menu,-%E2%80%94%20The%20IDE), it will hide deleted branches from the **Change Branch** list. + - You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). + - **Version Control Options menu —** The **Changes** section, under the Git actions button, lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu. From 0bd8f918b0ddf0f1ce6d92ab9ee96990595264bd Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:06:10 +0000 Subject: [PATCH 2/7] Update ide-user-interface.md --- website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index 510574faab8..a660007cc14 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -93,7 +93,7 @@ The console section, located below the File editor, includes various console tab The dbt Cloud IDE returns default row limits, however, you can also specify the number of records returned. Refer to the following sub-bullets for more info:

From 750e4ede8ad994604c45183d8e6a6de24e38aea2 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:04:21 +0000 Subject: [PATCH 3/7] Update website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md --- website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index 1bce7c361d4..5788dde9710 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -58,7 +58,8 @@ The IDE features some delightful tools and layouts to make it easier for you to 2. **Save button —** The editor has a **Save** button that saves editable files. Pressing the button or using the Command-S or Control-S shortcut saves the file contents. You don't need to save to preview code results in the Console section, but it's necessary before changes appear in a dbt invocation. The File Editor tab shows a blue icon for unsaved changes. 3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. - - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. Keep in mind, you can't delete branches from the remote branches directly using this menu. However, if you [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus:~:text=change%20their%20branch.-,IDE%20Options%20menu,-%E2%80%94%20The%20IDE), it will hide deleted branches from the **Change Branch** list. + - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. + - Keep in mind, although you can't delete branches from the remote branches directly using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus:~:text=change%20their%20branch.-,IDE%20Options%20menu,-%E2%80%94%20The%20IDE). Doing this will hide deleted branches from the **Change Branch** list. - You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). - **Version Control Options menu —** The **Changes** section, under the Git actions button, lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu. From 6f71c5c52bc5d68f7481cb91cf308958a5ff0a99 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:04:48 +0000 Subject: [PATCH 4/7] Update ide-user-interface.md --- website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index 5788dde9710..3ffed6ced24 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -58,8 +58,8 @@ The IDE features some delightful tools and layouts to make it easier for you to 2. **Save button —** The editor has a **Save** button that saves editable files. Pressing the button or using the Command-S or Control-S shortcut saves the file contents. You don't need to save to preview code results in the Console section, but it's necessary before changes appear in a dbt invocation. The File Editor tab shows a blue icon for unsaved changes. 3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. - - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. - - Keep in mind, although you can't delete branches from the remote branches directly using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus:~:text=change%20their%20branch.-,IDE%20Options%20menu,-%E2%80%94%20The%20IDE). Doing this will hide deleted branches from the **Change Branch** list. + - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. + - Keep in mind, although you can't delete branches from the remote branches directly using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus:~:text=change%20their%20branch.-,IDE%20Options%20menu,-%E2%80%94%20The%20IDE). Doing this will hide deleted branches from the **Change Branch** list. - You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). - **Version Control Options menu —** The **Changes** section, under the Git actions button, lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu. From 1a6476579a0b64596705f2d517d5b9c587622b93 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:40:47 +0000 Subject: [PATCH 5/7] Update website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md --- website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index 3ffed6ced24..da12e0db1fa 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -59,7 +59,7 @@ The IDE features some delightful tools and layouts to make it easier for you to 3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. - - Keep in mind, although you can't delete branches from the remote branches directly using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus:~:text=change%20their%20branch.-,IDE%20Options%20menu,-%E2%80%94%20The%20IDE). Doing this will hide deleted branches from the **Change Branch** list. + - Keep in mind, although you can't delete branches from the remote branches directly using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus). Doing this will hide deleted branches from the **Change Branch** list. - You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). - **Version Control Options menu —** The **Changes** section, under the Git actions button, lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu. From b3e7182d47cfc3abbf09009648abac431f0e3b35 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:35:09 +0000 Subject: [PATCH 6/7] Update website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md --- website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index da12e0db1fa..f90651312f1 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -59,7 +59,7 @@ The IDE features some delightful tools and layouts to make it easier for you to 3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. - - Keep in mind, although you can't delete branches from the remote branches directly using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus). Doing this will hide deleted branches from the **Change Branch** list. + - Keep in mind that although you can't delete local branches in the IDE using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus), which will delete all local branches and resync with all existing remote branches. - You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). - **Version Control Options menu —** The **Changes** section, under the Git actions button, lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu. From bcee1f859fb5855dad822d543db610370bb64878 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:36:12 +0000 Subject: [PATCH 7/7] Update website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md --- website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md index f90651312f1..6eb4dab90e9 100644 --- a/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md +++ b/website/docs/docs/cloud/dbt-cloud-ide/ide-user-interface.md @@ -59,7 +59,7 @@ The IDE features some delightful tools and layouts to make it easier for you to 3. **Version Control —** This menu contains all git-related elements, including the Git actions button. The button updates relevant actions based on your editor's state, such as prompting to pull remote changes, commit and sync when reverted commit changes are present, or creating a merge/pull request when appropriate. - The dropdown menu on the Git actions button allows users to revert changes, refresh Git state, create merge/pull requests, and change branches. - - Keep in mind that although you can't delete local branches in the IDE using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus), which will delete all local branches and resync with all existing remote branches. + - Keep in mind that although you can't delete local branches in the IDE using this menu, you can [reclone your repository](/docs/cloud/dbt-cloud-ide/ide-user-interface#modals-and-menus), which deletes your local branches and refreshes with the current remote branches, effectively removing the deleted ones. - You can also [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) and for more info on git, refer to [Version control basics](/docs/collaborate/git/version-control-basics#the-git-button-in-the-cloud-ide). - **Version Control Options menu —** The **Changes** section, under the Git actions button, lists all file changes since the last commit. You can click on a change to open the Git Diff View to see the inline changes. You can also right-click any file and use the file-specific options in the Version Control Options menu.