stash and restore uncommitted changes

src/create-or-update-branch.ts

@@ -170,9 +170,8 @@ export async function createOrUpdateBranch(
     }
   }
 
-  // Remove uncommitted tracked and untracked changes
-  await git.exec(['reset', '--hard'])
-  await git.exec(['clean', '-f', '-d'])
+  // Stash any uncommitted tracked and untracked changes
+  const stashed = await git.stashPush(['--include-untracked'])
 
   // Perform fetch and reset the working base
   // Commits made during the workflow will be removed
@@ -293,5 +292,10 @@ export async function createOrUpdateBranch(
   // Checkout the working base to leave the local repository as it was found
   await git.checkout(workingBase)
 
+  // Restore any stashed changes
+  if (stashed) {
+    await git.stashPop()
+  }
+
   return result
 }

src/git-command-manager.ts

@@ -210,6 +210,23 @@ export class GitCommandManager {
     return output.stdout.trim()
   }
 
+  async stashPush(options?: string[]): Promise<boolean> {
+    const args = ['stash', 'push']
+    if (options) {
+      args.push(...options)
+    }
+    const output = await this.exec(args)
+    return output.stdout.trim() !== 'No local changes to save'
+  }
+
+  async stashPop(options?: string[]): Promise<void> {
+    const args = ['stash', 'pop']
+    if (options) {
+      args.push(...options)
+    }
+    await this.exec(args)
+  }
+
   async status(options?: string[]): Promise<string> {
     const args = ['status']
     if (options) {