Showing logs for build greencapitaltrade/destiny/pr-1099 #7 stage from-build-pack and container prepare 2026/05/05 12:52:46 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1099 #7 stage from-build-pack and container place-scripts 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-0-8cf2m 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-1-4hn4h 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-2-zwnhd 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-3-wljmx 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-4-4f2kb 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-5-4hb7p 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-6-ctdgr 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-7-bcl9s 2026/05/05 12:52:47 Decoded script /tekton/scripts/script-8-2qjvg Showing logs for build greencapitaltrade/destiny/pr-1099 #7 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1099 #7 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1099/head:PR-1099@d163504b4ba49139f745192c490b8f8102fe479e to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1099/head -> PR-1099 Switched to branch 'PR-1099' HEAD is now at d163504b fix(ci): bypass broken docker-cache proxy, pull node:22-slim directly checked out revision: refs/pull/1099/head:PR-1099@d163504b4ba49139f745192c490b8f8102fe479e to dir: source Showing logs for build greencapitaltrade/destiny/pr-1099 #7 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:01c888897e9d7d2ea468b9283fbb48cc0bb84d45,1099:d163504b4ba49139f745192c490b8f8102fe479e:refs/pull/1099/head using base branch main and base sha 01c888897e9d7d2ea468b9283fbb48cc0bb84d45 merging sha: d163504b4ba49139f745192c490b8f8102fe479e error: error during merge: merging d163504b4ba49139f745192c490b8f8102fe479e into main: failed to run 'git merge d163504b4ba49139f745192c490b8f8102fe479e' command in directory '.', output: 'Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Auto-merging app.js Auto-merging index.js CONFLICT (content): Merge conflict in index.js Auto-merging models/aadhaar.js Auto-merging models/agreement.js CONFLICT (content): Merge conflict in models/agreement.js Auto-merging models/application.js CONFLICT (content): Merge conflict in models/application.js Auto-merging models/application_user.js CONFLICT (content): Merge conflict in models/application_user.js Auto-merging models/credit_score.js Auto-merging models/emandate.js Auto-merging models/personal_datum.js CONFLICT (content): Merge conflict in models/personal_datum.js Auto-merging package-lock.json CONFLICT (content): Merge conflict in package-lock.json Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging queue/consume.js Auto-merging routes/agreements.js CONFLICT (content): Merge conflict in routes/agreements.js Auto-merging routes/applications.js CONFLICT (content): Merge conflict in routes/applications.js Auto-merging routes/companies.js Auto-merging routes/credit_scores.js Auto-merging routes/statements.js CONFLICT (content): Merge conflict in routes/statements.js Auto-merging tests/pan.test.js CONFLICT (content): Merge conflict in tests/pan.test.js Auto-merging tests/unit/agreement.test.js CONFLICT (content): Merge conflict in tests/unit/agreement.test.js Auto-merging tests/unit/emandate.test.js CONFLICT (content): Merge conflict in tests/unit/emandate.test.js 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.