I am new to git but used Psychopy for a while, and excited about the online function. Thanks for developing it!
I have a old version experiment that already uploaded to the pavlovia, yesterday I copied that old version experiment file to another laptop mac with only Psychopy1.9 in it (because my mac still can’t install Psychopy3 properly…) and developed a new experiment (offline) based on that old experiment file. Today I want to upload this new experiment as a new project to pavlovia, but the problem happened. I copied code at below.
Basically, I opened that new experiment file with Psychopy3 and login Pavlovia in the Psychopy3 and then hit the new button that the small earth with refresh marker. problem comes…
It seems this new experiment conflicted with the old experiment/project already on my pavlovia account.
What should I do, I spend half day searching for the answer but failed… btw, I don’t really know how to play git…
Pushing files to PavloviaTraceback (most recent call last):
File “C:\Program Files (x86)\PsychoPy3\lib\site-packages\psychopy\app\pavlovia_ui\project.py”, line 455, in syncProject
File “C:\Program Files (x86)\PsychoPy3\lib\site-packages\psychopy\projects\pavlovia.py”, line 758, in firstPush
self.repo.git.push(’-u’, ‘origin’, ‘master’)
File “C:\Program Files (x86)\PsychoPy3\lib\site-packages\git\cmd.py”, line 548, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File “C:\Program Files (x86)\PsychoPy3\lib\site-packages\git\cmd.py”, line 1014, in _call_process
return self.execute(call, **exec_kwargs)
File “C:\Program Files (x86)\PsychoPy3\lib\site-packages\git\cmd.py”, line 825, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd(‘git’) failed due to: exit code(1)
cmdline: git push -u origin master
stderr: ‘To https://gitlab.pavlovia.org/chengyang/cfmt_chinese_version.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to ‘https://gitlab.pavlovia.org/chengyang/cfmt_chinese_version.git’
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., ‘git pull …’) before pushing again.
hint: See the ‘Note about fast-forwards’ in ‘git push --help’ for details.’