How to re-sync project after divergent branches error without downgrade

Online experiments
1

Hi there. I’ve fallen into the same error as this previous poster: Sync error: divergent branches

I appreciate the advise for preventing the error in the future, and I also manged to sync an updated version of my study after downgrading psychopy as suggested in the link above. However, I’m wondering if there is now a way to fix this error without needing to downgrade to sync and then re-upgrade to the latest psychophy version?

Thank you!

Andrew Silva

  File "C:\Program Files\PsychoPy\lib\site-packages\psychopy\app\builder\builder.py", line 1612, in onPavloviaSync
    pavlovia_ui.syncProject(parent=self, file=self.filename, project=self.project)
  File "C:\Program Files\PsychoPy\lib\site-packages\psychopy\app\pavlovia_ui\project.py", line 854, in syncProject
    project.sync()
  File "C:\Program Files\PsychoPy\lib\site-packages\psychopy\projects\pavlovia.py", line 914, in sync
    self.pull(infoStream)
  File "C:\Program Files\PsychoPy\lib\site-packages\psychopy\projects\pavlovia.py", line 971, in pull
    raise e
  File "C:\Program Files\PsychoPy\lib\site-packages\psychopy\projects\pavlovia.py", line 961, in pull
    info = self.repo.git.pull(self.remoteWithToken, 'master')
  File "C:\Program Files\PsychoPy\lib\site-packages\git\cmd.py", line 986, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "C:\Program Files\PsychoPy\lib\site-packages\git\cmd.py", line 1599, in _call_process
    return self.execute(call, **exec_kwargs)
  File "C:\Program Files\PsychoPy\lib\site-packages\git\cmd.py", line 1389, in execute
    raise GitCommandError(redacted_command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('C:\Program Files\PsychoPy\MinGit\cmd\git.exe') failed due to: exit code(128)
  cmdline: C:\Program Files\PsychoPy\MinGit\cmd\git.exe pull https://*****:*****@gitlab.pavlovia.org/HVNL/ventralcompletedfinal master
  stderr: 'warning: redirecting to https://gitlab.pavlovia.org/HVNL/ventralcompletedfinal.git/
From https://gitlab.pavlovia.org/HVNL/ventralcompletedfinal
 * branch              master     -> 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.'