GitCommandError: Cmd('git') failed due to: exit code(1)
cmdline: git cherry-pick --keep-redundant-commits --strategy-option=theirs updates~2
stderr: 'error: could not apply 2c2d2ce... WALinuxAgent-2.2.49.2 base
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit''
(5 additional frame(s) were not displayed)
...
File "dist2src/core.py", line 430, in perform_convert
from_branch=TEMP_SG_BRANCH, to_branch=dest_branch, theirs=update
File "dist2src/core.py", line 168, in cherry_pick_base
self.repo.git.cherry_pick(f"{from_branch}~{num_commits - 1}", **git_options)
File "git/cmd.py", line 542, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File "git/cmd.py", line 1005, in _call_process
return self.execute(call, **exec_kwargs)
File "git/cmd.py", line 822, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
Sentry Issue: DIST2SRC-UPDATE-Y