Reconcile Divergent Branches

[pcarinhas]

Traceback (most recent call last):
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/orquestra_manifest/morq.py", line 528, in morq_cli
    manifest.parse_args()
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/orquestra_manifest/morq.py", line 111, in parse_args
    args.func()
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/orquestra_manifest/morq.py", line 319, in update_repos
    update_status = git_pull_change(repo, ref)
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/orquestra_manifest/utils.py", line 223, in git_pull_change
    repo.remotes.origin.pull(ref)
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/git/remote.py", line 910, in pull
    res = self._get_fetch_info_from_stderr(proc, progress,
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/git/remote.py", line 750, in _get_fetch_info_from_stderr
    proc.wait(stderr=stderr_text)
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/git/cmd.py", line 501, in wait
    raise GitCommandError(remove_password_if_present(self.args), status, errstr)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git pull -v origin main
  stderr: 'fatal: Need to specify how to reconcile divergent branches.'

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/Users/carinhas/miniconda3/bin/morq", line 8, in <module>
    sys.exit(morq_cli())
  File "/Users/carinhas/miniconda3/lib/python3.9/site-packages/orquestra_manifest/morq.py", line 537, in morq_cli
    raise Exception from ex
Exception