Showing logs for build greencapitaltrade/happy/pr-215 #1 stage from-build-pack and container prepare
2026/06/01 16:01:06 Entrypoint initialization

Showing logs for build greencapitaltrade/happy/pr-215 #1 stage from-build-pack and container place-scripts
2026/06/01 16:01:07 Decoded script /tekton/scripts/script-0-4swj2
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-1-qg5ft
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-2-js9p7
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-3-xjcw5
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-4-rj8xk
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-5-5dnn4
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-6-vxrcq
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-8-mmq42
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-9-8vggc
2026/06/01 16:01:08 Decoded script /tekton/scripts/script-10-pvtpg

Showing logs for build greencapitaltrade/happy/pr-215 #1 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/happy/pr-215 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/happy.git version refs/pull/215/head:PR-215@e9f0338cdf19033956f8fb65a90f272e3f7b7fe6 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/happy
 * [new ref]         refs/pull/215/head -> PR-215
Switched to branch 'PR-215'
HEAD is now at e9f0338 fix: correct sequelize config path in .sequelizerc
checked out revision: refs/pull/215/head:PR-215@e9f0338cdf19033956f8fb65a90f272e3f7b7fe6 to dir: source

Showing logs for build greencapitaltrade/happy/pr-215 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:727dbe9308481ac08e9989ad7e3648c9b864a84c,215:e9f0338cdf19033956f8fb65a90f272e3f7b7fe6:refs/pull/215/head
using base branch main and base sha 727dbe9308481ac08e9989ad7e3648c9b864a84c
merging sha: e9f0338cdf19033956f8fb65a90f272e3f7b7fe6
error: error during merge: merging e9f0338cdf19033956f8fb65a90f272e3f7b7fe6 into main: failed to run 'git merge e9f0338cdf19033956f8fb65a90f272e3f7b7fe6' command in directory '.', output: 'Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.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.