git : error: Your local changes to the following files would be overwritten by 
checkout:
所在位置 行:1 字符: 1
+ git checkout main 1> d:\git-6\step1.out.txt 2>&1; "---" | Out-File -A ...
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (error: Your loc...en by checkout: 
   :String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError
 
	doc/html/package-lock.json
	doc/html/package.json
	yaoai-comic-studio/mvnw.cmd
Please commit your changes or stash them before you switch branches.
error: The following untracked working tree files would be overwritten by check
out:
	.env.example
	.gitignore
	README.md
	design-docs/00-README.md
	design-docs/01-浜у搧瀹氫綅涓嶴aaS鍖栫瓥鐣?md
	design-docs/02-鍓嶇鍔熻兘涓庨〉闈㈡竻鍗?md
	design-docs/03-涓夊紑婧愰」鐩姣斾笌鍚告敹.md
	design-docs/04-鏍稿績涓氬姟娴佺▼涓嶢I娴佹按绾?md
	design-docs/05-鍚庣鏋舵瀯璁捐.md
	design-docs/06-鏁版嵁搴撹璁?md
	design-docs/07-API鎺ュ彛瑙勮寖.md
	design-docs/08-寮傛浠诲姟涓嶢I宸ヤ綔娴?md
	design-docs/09-璁¤垂涓庡绉熸埛SaaS鍩虹璁炬柦.md
	design-docs/10-閮ㄧ讲涓庤繍缁?md
	design-docs/11-瀹炴柦璺嚎鍥句笌閲岀▼纰?md
	design-docs/12-鍓嶇鍘熷瀷澶嶇洏涓庢祦绋嬮獙璇?md
	design-docs/13-澶欰gent鍔熻兘澶嶇洏涓庤惤鍦版柟妗?md
	design-docs/14-鍓嶇鍘熷瀷鎴浘澶嶇洏涓庢渶缁堢‘璁?md
	design-docs/15-鎵ц浠诲姟鍒楄〃 copy.md
	design-docs/16-瀹炴柦寮€鍙戜换鍔″垪琛?md
	design-docs/17-骞冲彴杩愯惀鍚庡彴璁捐.md
	design-docs/18-Agent鍓ф儏鐞嗚В涓庝竴鑷存€ч檮褰?md
	design-docs/18-Agent鍗囩骇鏂规PRD.md
	design-docs/18-Agent瀹炴柦缁嗚妭闄勫綍.md
	design-docs/19-UIUX鏁翠綋浼樺寲鏂规.md
	design-docs/video-generation-structured-redesign.md
	design-docs/绔埌绔祦绋嬮獙璇?md
	design-docs/瑙嗛浠诲姟鎸佷箙鍖栦笌杞閲嶆瀯.md
	design-docs/璁捐鏂囨。瀹℃煡鎰忚.md
	doc/h5/.env.development
	doc/h5/.env.production
	doc/h5/.gitignore
	doc/h5/README.md
	doc/h5/index.html
	doc/h5/package-lock.json
	doc/h5/package.json
	doc/h5/src/App.vue
	doc/h5/src/api/login.ts
	doc/h5/src/components/Aside.vue
	doc/h5/src/components/Header.vue
	doc/h5/src/components/Navbar.vue
	doc/h5/src/components/UploadSingleFile.vue
	doc/h5/src/components/UploadSingleImg.vue
	doc/h5/src/main.ts
	doc/h5/src/router/index.ts
	doc/h5/src/services/api.ts
	doc/h5/src/services/http.ts
	doc/h5/src/static/imgs/Frame.png
	doc/h5/src/static/imgs/bg1.png
	doc/h5/src/static/imgs/box.png
	doc/h5/src/static/imgs/fileupload.png
	doc/h5/src/static/imgs/icon1.png
	doc/h5/src/static/imgs/logo.png
	doc/h5/src/static/imgs/mp4.mp4
	doc/h5/src/static/imgs/tuoz.png
	doc/h5/src/static/imgs/zhen.png
	doc/h5/src/static/styles/common.scss
	doc/h5/src/stores/useAuth.ts
	doc/h5/src/style.css
	doc/h5/src/views/About.vue
	doc/h5/src/views/Home.vue
	doc/h5/src/views/Login.vue
	doc/h5/src/views/NotFound.vue
	doc/h5/src/views/enterprise/team.vue
	doc/h5/src/views/enterprise/usage.vue
	doc/h5/src/views/enterprise/watermark.vue
	doc/h5/src/views/project/asset.vue
	doc/h5/src/views/project/components/AiEditModal.vue
	doc/h5/src/views/project/components/BatchModal.vue
	doc/h5/src/views/project/components/DepotModal.vue
	doc/h5/src/views/project/components/DramaHeader.vue
	doc/h5/src/views/project/components/EditModal.vue
	doc/h5/src/views/project/components/EditProjectNameDialog.vue
	doc/h5/src/views/project/components/Empty.vue
	doc/h5/src/views/project/components/Episode.vue
	doc/h5/src/views/project/components/IconType.vue
	doc/h5/src/views/project/components/LocalUploadModal.vue
	doc/h5/src/views/project/components/RichTextEditor.vue
	doc/h5/src/views/project/components/StepFour.vue
	doc/h5/src/views/project/components/StepOne.vue
	doc/h5/src/views/project/components/StepThree.vue
	doc/h5/src/views/project/components/StepThreeFour.vue
	doc/h5/src/views/project/components/StepTwo.vue
	doc/h5/src/views/project/components/VideoPlayModal.vue
	doc/h5/src/views/project/drama.vue
	doc/h5/src/views/project/projectlist.vue
	doc/h5/tsconfig.json
	doc/h5/tsconfig.node.json
	doc/h5/vite.config.ts
	doc/html/.dockerignore
	doc/html/ATTRIBUTIONS.md
	doc/html/Dockerfile
	doc/html/README.md
	doc/html/default_shadcn_theme.css
	doc/html/guidelines/Guidelines.md
	doc/html/index.html
	doc/html/nginx.conf
	doc/html/pnpm-lock.yaml
	doc/html/pnpm-workspace.yaml
	doc/html/postcss.config.mjs
	doc/html/src/app/App.tsx
	doc/html/src/app/components/Layout.tsx
	doc/html/src/app/components/PrivateRoute.tsx
	doc/html/src/app/components/figma/ImageWithFallback.tsx
	doc/html/src/app/components/ui/accordion.tsx
	doc/html/src/app/components/ui/alert-dialog.tsx
	doc/html/src/app/components/ui/alert.tsx
	doc/html
Aborting
---
git : error: cannot delete branch 'feature/admin-upgrade' used by worktree at '
D:/git-6'
所在位置 行:1 字符: 100
+ ... git-6\step1.out.txt; git branch -D feature/admin-upgrade 2>&1 | Out-F ...
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (error: cannot d...e at 'D:/git-6' 
   :String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError
 
---
git : error: Your local changes to the following files would be overwritten by 
checkout:
所在位置 行:1 字符: 233
+ ... p1.out.txt; git checkout -b feature/admin-upgrade origin/main 2>&1 |  ...
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (error: Your loc...en by checkout: 
   :String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError
 
	doc/html/package-lock.json
	doc/html/package.json
	yaoai-comic-studio/mvnw.cmd
Please commit your changes or stash them before you switch branches.
error: The following untracked working tree files would be overwritten by check
out:
	.env.example
	.gitignore
	README.md
	design-docs/00-README.md
	design-docs/01-浜у搧瀹氫綅涓嶴aaS鍖栫瓥鐣?md
	design-docs/02-鍓嶇鍔熻兘涓庨〉闈㈡竻鍗?md
	design-docs/03-涓夊紑婧愰」鐩姣斾笌鍚告敹.md
	design-docs/04-鏍稿績涓氬姟娴佺▼涓嶢I娴佹按绾?md
	design-docs/05-鍚庣鏋舵瀯璁捐.md
	design-docs/06-鏁版嵁搴撹璁?md
	design-docs/07-API鎺ュ彛瑙勮寖.md
	design-docs/08-寮傛浠诲姟涓嶢I宸ヤ綔娴?md
	design-docs/09-璁¤垂涓庡绉熸埛SaaS鍩虹璁炬柦.md
	design-docs/10-閮ㄧ讲涓庤繍缁?md
	design-docs/11-瀹炴柦璺嚎鍥句笌閲岀▼纰?md
	design-docs/12-鍓嶇鍘熷瀷澶嶇洏涓庢祦绋嬮獙璇?md
	design-docs/13-澶欰gent鍔熻兘澶嶇洏涓庤惤鍦版柟妗?md
	design-docs/14-鍓嶇鍘熷瀷鎴浘澶嶇洏涓庢渶缁堢‘璁?md
	design-docs/15-鎵ц浠诲姟鍒楄〃 copy.md
	design-docs/16-瀹炴柦寮€鍙戜换鍔″垪琛?md
	design-docs/17-骞冲彴杩愯惀鍚庡彴璁捐.md
	design-docs/18-Agent鍓ф儏鐞嗚В涓庝竴鑷存€ч檮褰?md
	design-docs/18-Agent鍗囩骇鏂规PRD.md
	design-docs/18-Agent瀹炴柦缁嗚妭闄勫綍.md
	design-docs/19-UIUX鏁翠綋浼樺寲鏂规.md
	design-docs/video-generation-structured-redesign.md
	design-docs/绔埌绔祦绋嬮獙璇?md
	design-docs/瑙嗛浠诲姟鎸佷箙鍖栦笌杞閲嶆瀯.md
	design-docs/璁捐鏂囨。瀹℃煡鎰忚.md
	doc/h5/.env.development
	doc/h5/.env.production
	doc/h5/.gitignore
	doc/h5/README.md
	doc/h5/index.html
	doc/h5/package-lock.json
	doc/h5/package.json
	doc/h5/src/App.vue
	doc/h5/src/api/login.ts
	doc/h5/src/components/Aside.vue
	doc/h5/src/components/Header.vue
	doc/h5/src/components/Navbar.vue
	doc/h5/src/components/UploadSingleFile.vue
	doc/h5/src/components/UploadSingleImg.vue
	doc/h5/src/main.ts
	doc/h5/src/router/index.ts
	doc/h5/src/services/api.ts
	doc/h5/src/services/http.ts
	doc/h5/src/static/imgs/Frame.png
	doc/h5/src/static/imgs/bg1.png
	doc/h5/src/static/imgs/box.png
	doc/h5/src/static/imgs/fileupload.png
	doc/h5/src/static/imgs/icon1.png
	doc/h5/src/static/imgs/logo.png
	doc/h5/src/static/imgs/mp4.mp4
	doc/h5/src/static/imgs/tuoz.png
	doc/h5/src/static/imgs/zhen.png
	doc/h5/src/static/styles/common.scss
	doc/h5/src/stores/useAuth.ts
	doc/h5/src/style.css
	doc/h5/src/views/About.vue
	doc/h5/src/views/Home.vue
	doc/h5/src/views/Login.vue
	doc/h5/src/views/NotFound.vue
	doc/h5/src/views/enterprise/team.vue
	doc/h5/src/views/enterprise/usage.vue
	doc/h5/src/views/enterprise/watermark.vue
	doc/h5/src/views/project/asset.vue
	doc/h5/src/views/project/components/AiEditModal.vue
	doc/h5/src/views/project/components/BatchModal.vue
	doc/h5/src/views/project/components/DepotModal.vue
	doc/h5/src/views/project/components/DramaHeader.vue
	doc/h5/src/views/project/components/EditModal.vue
	doc/h5/src/views/project/components/EditProjectNameDialog.vue
	doc/h5/src/views/project/components/Empty.vue
	doc/h5/src/views/project/components/Episode.vue
	doc/h5/src/views/project/components/IconType.vue
	doc/h5/src/views/project/components/LocalUploadModal.vue
	doc/h5/src/views/project/components/RichTextEditor.vue
	doc/h5/src/views/project/components/StepFour.vue
	doc/h5/src/views/project/components/StepOne.vue
	doc/h5/src/views/project/components/StepThree.vue
	doc/h5/src/views/project/components/StepThreeFour.vue
	doc/h5/src/views/project/components/StepTwo.vue
	doc/h5/src/views/project/components/VideoPlayModal.vue
	doc/h5/src/views/project/drama.vue
	doc/h5/src/views/project/projectlist.vue
	doc/h5/tsconfig.json
	doc/h5/tsconfig.node.json
	doc/h5/vite.config.ts
	doc/html/.dockerignore
	doc/html/ATTRIBUTIONS.md
	doc/html/Dockerfile
	doc/html/README.md
	doc/html/default_shadcn_theme.css
	doc/html/guidelines/Guidelines.md
	doc/html/index.html
	doc/html/nginx.conf
	doc/html/pnpm-lock.yaml
	doc/html/pnpm-workspace.yaml
	doc/html/postcss.config.mjs
	doc/html/src/app/App.tsx
	doc/html/src/app/components/Layout.tsx
	doc/html/src/app/components/PrivateRoute.tsx
	doc/html/src/app/components/figma/ImageWithFallback.tsx
	doc/html/src/app/components/ui/accordion.tsx
	doc/html/src/app/components/ui/alert-dialog.tsx
	doc/html/src/app/components/ui/alert.tsx
	doc/html
Aborting
---
## No commits yet on feature/admin-upgrade
A  doc/html/package-lock.json
A  doc/html/package.json
A  yaoai-comic-studio/mvnw.cmd
?? .env.example
?? .gitignore
?? README.md
?? design-docs/
?? doc/h5/
?? doc/html/.dockerignore
?? doc/html/ATTRIBUTIONS.md
?? doc/html/Dockerfile
?? doc/html/README.md
?? doc/html/default_shadcn_theme.css
?? doc/html/guidelines/
?? doc/html/index.html
?? doc/html/nginx.conf
?? doc/html/pnpm-lock.yaml
?? doc/html/pnpm-workspace.yaml
?? doc/html/postcss.config.mjs
?? doc/html/src/
?? doc/html/vite.config.ts
?? doc/miniapp/
?? docker-compose.yml
?? docs/
?? install_env.ps1
?? install_env_direct.ps1
?? start-dev.ps1
?? start-prod-local.ps1
?? yaoai-admin-web/
?? yaoai-comic-studio/.dockerignore
?? yaoai-comic-studio/.env.example
?? yaoai-comic-studio/.gitattributes
?? yaoai-comic-studio/.gitignore
?? yaoai-comic-studio/.mvn/
?? yaoai-comic-studio/Dockerfile
?? yaoai-comic-studio/build.cmd
?? yaoai-comic-studio/docker-compose.yml
?? yaoai-comic-studio/k8s/
?? yaoai-comic-studio/monitoring/
?? yaoai-comic-studio/pom.xml
?? yaoai-comic-studio/start.bat
?? yaoai-comic-studio/yaoai-admin/
?? yaoai-comic-studio/yaoai-agent/
?? yaoai-comic-studio/yaoai-ai-core/
?? yaoai-comic-studio/yaoai-ai-providers/
?? yaoai-comic-studio/yaoai-api/
?? yaoai-comic-studio/yaoai-billing/
?? yaoai-comic-studio/yaoai-bootstrap/
?? yaoai-comic-studio/yaoai-common/
?? yaoai-comic-studio/yaoai-domain/
?? yaoai-comic-studio/yaoai-media/
?? yaoai-comic-studio/yaoai-pipeline/
?? yaoai-comic-studio/yaoai-security/
?? yaoai-comic-studio/yaoai-storage/
?? yaoai-comic-studio/yaoai-task/
?? yaoai-comic-studio/yaoai-test/
?? yaoai-comic-studio/yaoai-worker/
---
common-ancestor-check:
git : fatal: Not a valid object name feature/admin-upgrade
所在位置 行:1 字符: 560
+ ... p1.out.txt; git merge-base origin/main feature/admin-upgrade 2>&1 | O ...
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (fatal: Not a va...e/admin-upgrade 
   :String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError
 
