17:24:38: INFO: Transaction for akeshet:773826:ab9343fd is akeshet:773826:ab9343fd.                                                             [77/1881]
17:24:38: DEBUG: Attempting transaction for akeshet:773826:ab9343fd: changes: akeshet:773826:ab9343fd

STEP_LINK: akeshet:773826:ab9343fd; https://chromium-review.googlesource.com/#/c/773826/
17:24:38: INFO: Attempting to cherry-pick change akeshet:773826:ab9343fd:"Merge branch 'branchline2' into mergeline2"
17:24:38: DEBUG: ending retries with error: <class 'chromite.lib.cros_build_lib.RunCommandError'>(return code: 128; command: git rev-list -n1 patch_branc
h --
fatal: bad revision 'patch_branch'

cmd=['git', 'rev-list', '-n1', 'patch_branch', '--'], cwd=/usr/local/google/home/akeshet/tryjob/repository/infra/dummies/merge-sandbox)
error: commit ab9343fd23a5faaa5f95fd77396c3cc77af42015 is a merge but no -m option was given.
fatal: cherry-pick failed
17:24:38: DEBUG: ending retries with error: <class 'chromite.lib.cros_build_lib.RunCommandError'>(return code: 128; command: git cherry-pick --strategy r
esolve --ff ab9343fd23a5faaa5f95fd77396c3cc77af42015
cmd=['git', 'cherry-pick', '--strategy', 'resolve', '--ff', u'ab9343fd23a5faaa5f95fd77396c3cc77af42015'], cwd=/usr/local/google/home/akeshet/tryjob/repos
itory/infra/dummies/merge-sandbox)
17:24:38: ERROR: Unknown cherry-pick exit code 128; return code: 128; command: git cherry-pick --strategy resolve --ff ab9343fd23a5faaa5f95fd77396c3cc77a
f42015
cmd=['git', 'cherry-pick', '--strategy', 'resolve', '--ff', u'ab9343fd23a5faaa5f95fd77396c3cc77af42015'], cwd=/usr/local/google/home/akeshet/tryjob/repos
itory/infra/dummies/merge-sandbox
17:24:38: INFO: Rewinding transaction: failed changes: akeshet:773826:ab9343fd:"Merge branch 'branchline2' into mergeline2" .
Traceback (most recent call last):
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/patch_series.py", line 941, in _Transaction
    yield
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/patch_series.py", line 886, in Apply
    self._ApplyChanges(inducing_change, transaction_changes)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/patch_series.py", line 110, in f
    return functor(self, parent, *args, **kwargs)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/patch_series.py", line 976, in _ApplyChanges
    self.ApplyChange(change)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/stages/sync_stages.py", line 174, in ApplyChange
    return patch_series.PatchSeries.ApplyChange(self, change)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/patch_series.py", line 306, in f
    return functor(self, *args, **kwargs)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/cbuildbot/patch_series.py", line 342, in ApplyChange
    return change.ApplyAgainstManifest(self.manifest, trivial=False)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/lib/patch.py", line 1157, in ApplyAgainstManifest
    trivial=trivial)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/lib/patch.py", line 1120, in Apply
    self.CherryPick(git_repo, trivial=trivial, inflight=inflight)
  File "/usr/local/google/home/akeshet/tryjob/repository/chromite/lib/patch.py", line 1038, in CherryPick
    'command: %s' % (ret, error)))
ApplyPatchException: CL:773826 conflicted with ToT.