Showing logs for build greencapitaltrade/peggy/pr-242 #68 stage from-build-pack and container prepare 2026/04/09 10:41:36 Entrypoint initialization Showing logs for build greencapitaltrade/peggy/pr-242 #68 stage from-build-pack and container place-scripts 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-0-w4spn 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-1-gzn9g 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-2-v849g 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-3-nxn8p 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-4-tln4j 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-6-tfgt5 2026/04/09 10:41:38 Decoded script /tekton/scripts/script-7-hdn7n Showing logs for build greencapitaltrade/peggy/pr-242 #68 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/peggy/pr-242 #68 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/peggy.git version refs/pull/242/head:PR-242@c2a3a595ce91285fa340d75ba2b07e799ae618a0 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/peggy * [new ref] refs/pull/242/head -> PR-242 Switched to branch 'PR-242' HEAD is now at c2a3a595 fix: use custom themes in @my/config instead of defaultConfig checked out revision: refs/pull/242/head:PR-242@c2a3a595ce91285fa340d75ba2b07e799ae618a0 to dir: source Showing logs for build greencapitaltrade/peggy/pr-242 #68 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:d91be811149a918124e13b5f656fc411113f316d,242:c2a3a595ce91285fa340d75ba2b07e799ae618a0:refs/pull/242/head using base branch main and base sha d91be811149a918124e13b5f656fc411113f316d merging sha: c2a3a595ce91285fa340d75ba2b07e799ae618a0 error: error during merge: merging c2a3a595ce91285fa340d75ba2b07e799ae618a0 into main: failed to run 'git merge c2a3a595ce91285fa340d75ba2b07e799ae618a0' command in directory '.', output: 'CONFLICT (modify/delete): apps/expo/app/(tabs)/_layout.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of apps/expo/app/(tabs)/_layout.tsx left in tree. CONFLICT (modify/delete): apps/expo/app/(tabs)/shopping/_layout.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of apps/expo/app/(tabs)/shopping/_layout.tsx left in tree. Auto-merging apps/expo/app/_layout.tsx CONFLICT (content): Merge conflict in apps/expo/app/_layout.tsx CONFLICT (modify/delete): apps/next/utils/guestOnly.ts deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of apps/next/utils/guestOnly.ts left in tree. CONFLICT (modify/delete): apps/storybook-rn/.storybook/decorator.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of apps/storybook-rn/.storybook/decorator.tsx left in tree. Auto-merging packages/app/components/EmiSelection.tsx CONFLICT (file location): packages/galaxycard/features/auth/components/Pin-Input.tsx added in HEAD inside a directory that was renamed in c2a3a595ce91285fa340d75ba2b07e799ae618a0, suggesting it should perhaps be moved to packages/app/features/auth/components/Pin-Input.tsx. Auto-merging packages/app/features/utility/recharge-screen.tsx Auto-merging packages/app/utils/cookieStorage.web.tsx CONFLICT (modify/delete): packages/galaxycard/components/Calendar/components/DateGrid.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/components/Calendar/components/DateGrid.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/components/Calendar/components/Month.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/components/Calendar/components/Month.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/components/Calendar/components/MonthGrid.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/components/Calendar/components/MonthGrid.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/components/Calendar/components/YearGrid.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/components/Calendar/components/YearGrid.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/components/Heading/Heading.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/components/Heading/Heading.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/components/TabBar.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/components/TabBar.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/features/blog/screen.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/features/blog/screen.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/features/refer/screen.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/features/refer/screen.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/features/shopping/categories/screen.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/features/shopping/categories/screen.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/features/shopping/category/screen.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/features/shopping/category/screen.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/features/shopping/product/screen.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/features/shopping/product/screen.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/utils/common.tsx deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/utils/common.tsx left in tree. CONFLICT (modify/delete): packages/galaxycard/utils/usePathname.web.ts deleted in c2a3a595ce91285fa340d75ba2b07e799ae618a0 and modified in HEAD. Version HEAD of packages/galaxycard/utils/usePathname.web.ts left in tree. Auto-merging packages/ui/src/components/Slider.tsx Auto-merging packages/ui/src/utils/bugsnag/index.web.tsx CONFLICT (content): Merge conflict in packages/ui/src/utils/bugsnag/index.web.tsx Auto-merging tsconfig.json CONFLICT (content): Merge conflict in tsconfig.json Automatic merge failed; fix conflicts and then commit the result.'  Pipeline failed on stage 'from-build-pack' : container 'step-git-merge'. The execution of the pipeline has stopped.