Showing logs for build greencapitaltrade/destiny/pr-1220 #1 stage from-build-pack and container prepare
2026/06/19 21:47:33 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1220 #1 stage from-build-pack and container place-scripts
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-0-fj2s7
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-1-lhjh9
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-2-7fdvh
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-3-snm8b
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-4-nrk9h
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-5-n5cs2
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-6-krjm9
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-7-7v6vx
2026/06/19 21:47:34 Decoded script /tekton/scripts/script-8-vqrcs

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

Showing logs for build greencapitaltrade/destiny/pr-1220 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1220/head:PR-1220@aa9d613e7c502f0732b647e2b569293ba7a75d28 to dir: source
Cloning into 'source'...
Updating files:  79% (385/482)
Updating files:  80% (386/482)
Updating files:  81% (391/482)
Updating files:  82% (396/482)
Updating files:  83% (401/482)
Updating files:  84% (405/482)
Updating files:  85% (410/482)
Updating files:  86% (415/482)
Updating files:  87% (420/482)
Updating files:  88% (425/482)
Updating files:  89% (429/482)
Updating files:  90% (434/482)
Updating files:  91% (439/482)
Updating files:  92% (444/482)
Updating files:  93% (449/482)
Updating files:  94% (454/482)
Updating files:  95% (458/482)
Updating files:  96% (463/482)
Updating files:  97% (468/482)
Updating files:  98% (473/482)
Updating files:  99% (478/482)
Updating files: 100% (482/482)
Updating files: 100% (482/482), done.
From https://github.com/greencapitaltrade/destiny
 * [new ref]           refs/pull/1220/head -> PR-1220
Switched to branch 'PR-1220'
HEAD is now at aa9d613e Merge pull request #1234 from greencapitaltrade/jarvis/issue-1175
checked out revision: refs/pull/1220/head:PR-1220@aa9d613e7c502f0732b647e2b569293ba7a75d28 to dir: source

Showing logs for build greencapitaltrade/destiny/pr-1220 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:cfc958b4a1b4fd02251fc41486894a2f975c3f71,1220:aa9d613e7c502f0732b647e2b569293ba7a75d28:refs/pull/1220/head
using base branch main and base sha cfc958b4a1b4fd02251fc41486894a2f975c3f71
merging sha: aa9d613e7c502f0732b647e2b569293ba7a75d28
error: error during merge: merging aa9d613e7c502f0732b647e2b569293ba7a75d28 into main: failed to run 'git merge aa9d613e7c502f0732b647e2b569293ba7a75d28' command in directory '.', output: 'Auto-merging .devcontainer/devcontainer.json
CONFLICT (add/add): Merge conflict in .devcontainer/devcontainer.json
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging .husky/pre-commit
CONFLICT (add/add): Merge conflict in .husky/pre-commit
Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
CONFLICT (add/add): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml
Auto-merging JARVIS_TECH_CONTRACT.md
CONFLICT (add/add): Merge conflict in JARVIS_TECH_CONTRACT.md
Auto-merging app.js
CONFLICT (content): Merge conflict in app.js
Auto-merging config/kafka.js
CONFLICT (add/add): Merge conflict in config/kafka.js
Auto-merging engine/handlers/credit_check.js
CONFLICT (add/add): Merge conflict in engine/handlers/credit_check.js
Auto-merging engine/index.js
CONFLICT (add/add): Merge conflict in engine/index.js
Auto-merging helpers/bank_statement_analyzer.js
CONFLICT (add/add): Merge conflict in helpers/bank_statement_analyzer.js
Auto-merging index.js
CONFLICT (content): Merge conflict in index.js
Auto-merging middlewares/application_user.js
CONFLICT (add/add): Merge conflict in middlewares/application_user.js
Auto-merging migrations/20260526000001-create-integration-credentials.js
CONFLICT (add/add): Merge conflict in migrations/20260526000001-create-integration-credentials.js
Auto-merging migrations/20260615174312-harden-sanctions-terms.js
CONFLICT (add/add): Merge conflict in migrations/20260615174312-harden-sanctions-terms.js
Auto-merging models/agreement.js
CONFLICT (content): Merge conflict in models/agreement.js
Auto-merging models/agreement_template.js
CONFLICT (add/add): Merge conflict in models/agreement_template.js
Auto-merging models/application.js
CONFLICT (content): Merge conflict in models/application.js
Auto-merging models/application_user.js
CONFLICT (add/add): Merge conflict in models/application_user.js
Auto-merging models/application_user_document.js
CONFLICT (add/add): Merge conflict in models/application_user_document.js
Auto-merging models/bank_statement.js
CONFLICT (content): Merge conflict in models/bank_statement.js
Auto-merging models/credit_score.js
CONFLICT (add/add): Merge conflict in models/credit_score.js
Auto-merging models/emandate.js
CONFLICT (content): Merge conflict in models/emandate.js
Auto-merging models/index.js
CONFLICT (content): Merge conflict in models/index.js
Auto-merging models/integration_credential.js
CONFLICT (add/add): Merge conflict in models/integration_credential.js
Auto-merging models/pan.js
CONFLICT (content): Merge conflict in models/pan.js
Auto-merging models/personal_datum.js
CONFLICT (add/add): Merge conflict in models/personal_datum.js
Auto-merging models/sanction.js
CONFLICT (add/add): Merge conflict in models/sanction.js
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging preview/values.yaml.gotmpl
CONFLICT (add/add): Merge conflict in preview/values.yaml.gotmpl
Auto-merging provider/digio.js
CONFLICT (add/add): Merge conflict in provider/digio.js
Auto-merging queue/consume.js
CONFLICT (add/add): Merge conflict in queue/consume.js
Auto-merging routes/agreements.js
CONFLICT (add/add): Merge conflict in routes/agreements.js
Auto-merging routes/applications.js
CONFLICT (add/add): Merge conflict in routes/applications.js
Auto-merging routes/bank_statements.js
CONFLICT (add/add): Merge conflict in routes/bank_statements.js
Auto-merging routes/callbacks.js
CONFLICT (add/add): Merge conflict in routes/callbacks.js
Auto-merging routes/products.js
CONFLICT (add/add): Merge conflict in routes/products.js
Auto-merging routes/sanctions.js
CONFLICT (add/add): Merge conflict in routes/sanctions.js
Auto-merging routes/statements.js
CONFLICT (add/add): Merge conflict in routes/statements.js
Auto-merging steps/schemas.js
CONFLICT (add/add): Merge conflict in steps/schemas.js
Auto-merging tests/aadhaar.test.js
CONFLICT (content): Merge conflict in tests/aadhaar.test.js
Auto-merging tests/agreement.test.js
CONFLICT (add/add): Merge conflict in tests/agreement.test.js
Auto-merging tests/application_product.test.js
CONFLICT (add/add): Merge conflict in tests/application_product.test.js
Auto-merging tests/setup.js
CONFLICT (add/add): Merge conflict in tests/setup.js
Auto-merging tests/unit/agreement_preview_route.test.js
CONFLICT (add/add): Merge conflict in tests/unit/agreement_preview_route.test.js
Auto-merging tests/unit/bank_statement_hook.test.js
CONFLICT (add/add): Merge conflict in tests/unit/bank_statement_hook.test.js
Auto-merging tests/unit/document_collection.test.js
CONFLICT (add/add): Merge conflict in tests/unit/document_collection.test.js
Auto-merging tests/unit/flow_engine.test.js
CONFLICT (add/add): Merge conflict in tests/unit/flow_engine.test.js
Auto-merging tests/unit/sanction_patch_route.test.js
CONFLICT (add/add): Merge conflict in tests/unit/sanction_patch_route.test.js
Auto-merging tests/unit/statement.test.js
CONFLICT (add/add): Merge conflict in tests/unit/statement.test.js
Auto-merging tests/unit/steps_contract.test.js
CONFLICT (add/add): Merge conflict in tests/unit/steps_contract.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.