Hello! I'm developing a project with a bitbucket repository. No problem so far. I have a friend that got involved and wanna help. I shared the repo with him but I'm getting error on with branch conflict.
I'm running in the latest docker 64 image. The log shows the following:
5 Jun 15:06:24 - [error] Error: 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.
Is there anyway to resolve this in the docker image? I'm using NodeRed in Kubernetes, need to have an image that doesn't have this problem from scratch.