From 2ee5aa23f4308b4f82fc68fcfad6e8b57c39ab3f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 18 Aug 2025 13:37:01 -0700 Subject: [PATCH] typespec merged stay on main (#6702) Co-authored-by: Juan Ospina <70209456+jeo02@users.noreply.github.com> --- .../azsdk-tools/typespec-to-sdk.instructions.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md b/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md index d9c5f99c5..5487c87fb 100644 --- a/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md +++ b/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md @@ -3,11 +3,6 @@ description: 'Generate SDKs from TypeSpec' --- Your goal is to guide user through the process of generating SDKs from TypeSpec projects. Show all the high level steps to the user to ensure they understand the flow. Use the provided tools to perform actions and gather information as needed. -## Pre-Flight Check -- Verify ${workspaceFolder} is not on main branch -- If on main branch, prompt user: "You are currently on the main branch. Please create a new branch using `git checkout -b ` before proceeding." -- Wait for user confirmation before continuing - ## Step 1: Identify TypeSpec Project **Goal**: Locate the TypeSpec project root path **Actions**: @@ -46,7 +41,8 @@ Your goal is to guide user through the process of generating SDKs from TypeSpec 3. Display all modified files (excluding `.github` and `.vscode` folders) 4. Prompt user: "Please review the modified files. Do you want to commit these changes? (yes/no)" 5. If yes: - - Verify current branch is not "main" + - If on main branch, prompt user: "You are currently on the main branch. Please create a new branch using `git checkout -b ` before proceeding." + - Wait for user confirmation before continuing - Run `git add ` - Prompt for commit message - Run `git commit -m ""`