Faced the following issue today
Job “run_background_synchronization (trigger: cron[minute=’*’], next run at: 2020-08-20 15:28:00 UTC)” raised an exception Traceback (most recent call last): File “/usr/local/lib/python3.7/site-packages/apscheduler/executors/base.py”, line 125, in run_job retval = job.func(*job.args, **job.kwargs) File “/usr/local/lib/python3.7/site-packages/rasax/community/services/integrated_version_control/git_service.py”, line 73, in run_background_synchronization loop.run_until_complete(git_service.synchronize_project(force_data_injection)) File “uvloop/loop.pyx”, line 1456, in uvloop.loop.Loop.run_until_complete File “/usr/local/lib/python3.7/site-packages/rasax/community/services/integrated_version_control/git_service.py”, line 812, in synchronize_project self.merge_latest_remote_branch() File “/usr/local/lib/python3.7/site-packages/rasax/community/services/integrated_version_control/git_service.py”, line 592, in merge_latest_remote_branch self._repository.git.merge(self._remote_branch_name(current_branch)) File “/usr/local/lib/python3.7/site-packages/git/cmd.py”, line 542, in return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File “/usr/local/lib/python3.7/site-packages/git/cmd.py”, line 1005, in _call_process return self.execute(call, **exec_kwargs) File “/usr/local/lib/python3.7/site-packages/git/cmd.py”, line 822, in execute raise GitCommandError(command, status, stderr_value, stdout_value) git.exc.GitCommandError: Cmd(‘git’) failed due to: exit code(128) cmdline: git merge origin/rasa-x stderr: ‘fatal: refusing to merge unrelated histories’
Is there a way to fix this? I was not able to push my rasa-x changes to git, on an existing or new branch. I disconnected and remapped the git but still could not sync my changes, is there a way to not lost your changes while facing this issue?