[master] chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800

[ks-ci-bot]

Manual cherrypick required.

#4580 failed to apply on top of branch "master":

Applying: chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800
Using index info to reconstruct a base tree...
A	packages/bootstrap/assets/v3dist/0.6fac5a135fa3c825a832.js
A	packages/bootstrap/assets/v3dist/1.1f91ae94961db45923d5.css
A	packages/bootstrap/assets/v3dist/1.9a6f955ed03f382d4155.js
A	packages/bootstrap/assets/v3dist/10.4af684f1e15bf2da291c.js
A	packages/bootstrap/assets/v3dist/10.8276eb0b449e3bb00941.css
A	packages/bootstrap/assets/v3dist/11.8bff94a8dedeaf13e8df.js
A	packages/bootstrap/assets/v3dist/11.b74312b312e85b52ffe3.css
A	packages/bootstrap/assets/v3dist/12.49eabf0be1e896684dc4.js
A	packages/bootstrap/assets/v3dist/12.8fd20e6207f7247eb2df.css
A	packages/bootstrap/assets/v3dist/16.a42277078bf5e81f2f72.js
A	packages/bootstrap/assets/v3dist/16.db71f060accdc4f3d668.css
A	packages/bootstrap/assets/v3dist/3.4034da02f5aa7af6b4c2.js
A	packages/bootstrap/assets/v3dist/3.603e4746fe9636878f5d.css
A	packages/bootstrap/assets/v3dist/4.14c2e79d0026ed1462e9.css
A	packages/bootstrap/assets/v3dist/4.bb2ce078b75a1849b253.js
A	packages/bootstrap/assets/v3dist/6.d037ff8030f59ce063f5.js
A	packages/bootstrap/assets/v3dist/6.da97061a7d9a043a188e.css
A	packages/bootstrap/assets/v3dist/7.9aeee280206d34e75c6a.js
A	packages/bootstrap/assets/v3dist/7.e6eb9ba8e0418fb3fba2.css
A	packages/bootstrap/assets/v3dist/8.0cf60f713b17a7301708.js
A	packages/bootstrap/assets/v3dist/8.a9e459e9a50412125b4c.css
A	packages/bootstrap/assets/v3dist/main.384475e36a6a5a2aed76.js
A	packages/bootstrap/assets/v3dist/main.a18a24a2c1d9e7c5aaf2.css
M	packages/bootstrap/assets/v3dist/manifest.json
Falling back to patching base and 3-way merge...
Auto-merging packages/bootstrap/assets/v3dist/manifest.json
CONFLICT (content): Merge conflict in packages/bootstrap/assets/v3dist/manifest.json
CONFLICT (rename/rename): Rename "packages/bootstrap/assets/v3dist/main.a18a24a2c1d9e7c5aaf2.css"->"packages/bootstrap/assets/v3dist/main.c9fbdf60777154f6e355.css" in branch "HEAD" rename "packages/bootstrap/assets/v3dist/main.a18a24a2c1d9e7c5aaf2.css"->"packages/bootstrap/assets/v3dist/main.9a9ca2d0b37f2fa5d7cf.css" in "chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800"
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/main.384475e36a6a5a2aed76.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/main.c20d799e657abd9699f6.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/main.c20d799e657abd9699f6.js left in tree.
Removing packages/bootstrap/assets/v3dist/locale-zh.4dcfc8f8663252717a8c.json
Removing packages/bootstrap/assets/v3dist/locale-tc.51f034784a9c9904d493.json
Removing packages/bootstrap/assets/v3dist/locale-es.17fac91efc88f812ecab.json
Removing packages/bootstrap/assets/v3dist/locale-en.60d9ddf6aff8fa136646.json
Removing packages/bootstrap/assets/v3dist/assets/strategy-waiting.svg
Removing packages/bootstrap/assets/v3dist/assets/strategy-paused.svg
Removing packages/bootstrap/assets/v3dist/assets/strategy-immediate.svg
Removing packages/bootstrap/assets/v3dist/assets/ks-update-version.svg
Removing packages/bootstrap/assets/v3dist/assets/ee7b96fa85d8fdb8c126409326ac2d2b.ttf
Removing packages/bootstrap/assets/v3dist/assets/eb43b4c3b3b6cac224f76c0a524946a1.woff
Removing packages/bootstrap/assets/v3dist/assets/d08840599e05db7345652d3d417574a9.ttf
Removing packages/bootstrap/assets/v3dist/assets/bd19ad60600a1537c00d3b4923a5e5de.ttf
Removing packages/bootstrap/assets/v3dist/assets/b52fac2bb93c5858f3f2675e4b52e1de.woff2
Removing packages/bootstrap/assets/v3dist/assets/94008e69aaf05da75c0bbf8f8bb0db41.woff2
Removing packages/bootstrap/assets/v3dist/assets/90d1676003d9c28c04994c18bfd8b558.woff2
Removing packages/bootstrap/assets/v3dist/assets/878ad7158f6fa9136d796d4bad613bc2.woff
Removing packages/bootstrap/assets/v3dist/assets/7b225d4d9324ee54ce6d9ec50e339668.woff
Removing packages/bootstrap/assets/v3dist/assets/73f0a88bbca1bec19fb1303c689d04c6.woff2
Removing packages/bootstrap/assets/v3dist/assets/6521f388081e84791dba294c9e7cfb4e.woff
Removing packages/bootstrap/assets/v3dist/assets/5df7f0532c1c39e04011b2ab0be1fe3c.woff
Removing packages/bootstrap/assets/v3dist/assets/563c4bd6da24f5ce46e7aee2aace04f9.woff
Removing packages/bootstrap/assets/v3dist/assets/4357beb823a5f8d65c260f045d9e019a.woff2
Removing packages/bootstrap/assets/v3dist/assets/42bbe4eefcde1297b11dc4b6491e9746.ttf
Removing packages/bootstrap/assets/v3dist/assets/3e1af3ef546b9e6ecef9f3ba197bf7d2.ttf
Removing packages/bootstrap/assets/v3dist/assets/1eb7a893589ddce89d81cdb22a356660.ttf
Removing packages/bootstrap/assets/v3dist/assets/13ec0eb5bdb821ff4930237d7c9f943f.woff2
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/8.0cf60f713b17a7301708.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/8.dd24137777862c49a2c9.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/8.dd24137777862c49a2c9.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/8.a9e459e9a50412125b4c.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/8.8ab900922d911ea988ce.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/8.8ab900922d911ea988ce.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/7.e6eb9ba8e0418fb3fba2.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/7.e11c3bcc603a61f7291c.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/7.e11c3bcc603a61f7291c.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/7.9aeee280206d34e75c6a.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/7.3c9a82c8b0e8f915b7b6.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/7.3c9a82c8b0e8f915b7b6.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/6.d037ff8030f59ce063f5.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/6.a4ba29252c43d0b3c55d.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/6.a4ba29252c43d0b3c55d.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/6.da97061a7d9a043a188e.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/6.436fb3894267395d4038.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/6.436fb3894267395d4038.css left in tree.
Removing packages/bootstrap/assets/v3dist/5.a3040a5317019d00196b.js
Removing packages/bootstrap/assets/v3dist/5.486c79d68bbfccf7c7a0.css
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/4.bb2ce078b75a1849b253.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/4.18fbd571b5639f361bab.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/4.18fbd571b5639f361bab.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/4.14c2e79d0026ed1462e9.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/4.082da54f919d8548485f.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/4.082da54f919d8548485f.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/3.603e4746fe9636878f5d.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/3.23b575b025058f9c0a1b.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/3.23b575b025058f9c0a1b.css left in tree.
Removing packages/bootstrap/assets/v3dist/2.8cca4bcd4480b11096a4.js
Removing packages/bootstrap/assets/v3dist/2.4c41e822088c11043e4d.css
Removing packages/bootstrap/assets/v3dist/17.aa9158094c2532f134d0.js
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/16.db71f060accdc4f3d668.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/16.a40c0cd845f396cf7d4d.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/16.a40c0cd845f396cf7d4d.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/16.a42277078bf5e81f2f72.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/16.02c5f9c123929387b614.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/16.02c5f9c123929387b614.js left in tree.
Removing packages/bootstrap/assets/v3dist/15.492236d383ff179dad26.js
Removing packages/bootstrap/assets/v3dist/14.6ca939a7309365ec890d.js
Removing packages/bootstrap/assets/v3dist/14.1d6c01bce4b6ce4204f6.css
Removing packages/bootstrap/assets/v3dist/13.2d1e0225534a42269734.js
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/12.8fd20e6207f7247eb2df.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/12.84ad409693abf456a92b.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/12.84ad409693abf456a92b.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/11.b74312b312e85b52ffe3.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/11.97d43ee3522860de5143.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/11.97d43ee3522860de5143.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/11.8bff94a8dedeaf13e8df.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/11.5c0e9ffaee5658b0875a.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/11.5c0e9ffaee5658b0875a.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/10.4af684f1e15bf2da291c.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/10.a5fe81063621229c7c30.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/10.a5fe81063621229c7c30.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/10.8276eb0b449e3bb00941.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/10.98757909f34a04cedcae.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/10.98757909f34a04cedcae.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/1.1f91ae94961db45923d5.css deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/1.dbffa09de0cdd776117b.css in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/1.dbffa09de0cdd776117b.css left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/1.9a6f955ed03f382d4155.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/1.c67fb29c553fbb3bfd08.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/1.c67fb29c553fbb3bfd08.js left in tree.
CONFLICT (rename/delete): packages/bootstrap/assets/v3dist/0.6fac5a135fa3c825a832.js deleted in chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800 and renamed to packages/bootstrap/assets/v3dist/0.31dcd8026ed05f7fd08c.js in HEAD. Version HEAD of packages/bootstrap/assets/v3dist/0.31dcd8026ed05f7fd08c.js left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore(bot): update v3dist from kse-console-embed:kse to kubesphere/console:release-4.1 at 2025-05-09 09:52:11+0800
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".