URL of experiment:
Description of the problem: When I am trying to sync my PsychoPy experiment (task 1) with Pavlovia I get a message that says that it doesn’t belong to any project. I tried to create a new project and then I could sync once, but then it stopped working again. Then I tried to sync through Pavlovia.org → Search Pavlovia → Browse the folder and then sync (on Builder), but then I get the following error:
" Traceback (most recent call last):
File “C:\Program Files\PsychoPy3\lib\site-packages\psychopy\app\pavlovia_ui\project.py”, line 364, in onSyncButton
File “C:\Program Files\PsychoPy3\lib\site-packages\psychopy\projects\pavlovia.py”, line 651, in sync
status = self.pull(infoStream=infoStream)
File “C:\Program Files\PsychoPy3\lib\site-packages\psychopy\projects\pavlovia.py”, line 694, in pull
File “C:\Program Files\PsychoPy3\lib\site-packages\psychopy\projects\pavlovia.py”, line 685, in pull
info = self.repo.git.pull(self.remoteWithToken, ‘master’)
File “C:\Program Files\PsychoPy3\lib\site-packages\git\cmd.py”, line 548, in
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File “C:\Program Files\PsychoPy3\lib\site-packages\git\cmd.py”, line 1014, in _call_process
return self.execute(call, **exec_kwargs)
File “C:\Program Files\PsychoPy3\lib\site-packages\git\cmd.py”, line 825, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd(‘C:\Program Files\PsychoPy3\MinGit\cmd\git.exe’) failed due to: exit code(1)
cmdline: C:\Program Files\PsychoPy3\MinGit\cmd\git.exe pull https://oauth2:email@example.com/rebecca_anagnost/ldt-task-1.git master
stdout: ‘Updating 410d88d…80e963a’
stderr: 'From https://gitlab.pavlovia.org/rebecca_anagnost/ldt-task-1
- branch master → FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.
I guess that this is because I edited the task_1.js file on Gitlab, but not locally on my computer, so there is one task_1.js file locally and another one online. However, even though I cannot sync through PsychoPy, when I run the experiment online, it works as I want it to (i.e. WITH the changes that I made in task_1.js). On the other hand, my second experiment (see second link above), doesn’t give me this error when I sync through PsychoPy, even though I made the same changes in the task_2.js file online (and not locally). In this case, though, when I run the experiment online, I don’t see the result of the changes I made.
How do I go about merging the two different files in order to successfully sync from now on?
Sorry, but I am very new to gitlab and programming, and all my attempts to look up an answer failed. I also tried to push the changes by using the “git push” command, but if I understand correctly the changes are already on gitlab, but do not exist locally.