Swiss-army-knife Toolbox for Salesforce. Orchestrates base commands and assist users with interactive wizards to make much more than native sfdx + Allows you to define a complete CI/CD Pipeline and Schedule a daily Metadata backup & monitoring of your orgs
When configuring org monitoring using bitbucket the pipeline step "Run MegaLinter" failed with the following error when running git pull origin "${BRANCH_NAME}"
+ git pull origin "${BRANCH_NAME}"
From http://bitbucket.org/path/to/repository
* branch HEAD -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Other pipeline steps which also do git pull origin "${BRANCH_NAME}" run export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | sed 's/refs\/heads\///')
So I've added this line also to the "Run MegaLinter" step and it solved the issue
When configuring org monitoring using bitbucket the pipeline step "Run MegaLinter" failed with the following error when running
git pull origin "${BRANCH_NAME}"
Other pipeline steps which also do
git pull origin "${BRANCH_NAME}"
runexport BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | sed 's/refs\/heads\///')
So I've added this line also to the "Run MegaLinter" step and it solved the issue