2011755 - Lando doesn't properly detect merge conflicts during `git cherry-pick`

Status: NEW

(Conduit :: Lando, defect, P3)

Description

[Connor Sheehan [:sheehan]]

See the uplift job error for firefox-release at https://lando.moz.tools/D279261/

Despite the failure being due to a merge conflict, it was not properly detected for display in Lando.

Comment 1

[Connor Sheehan [:sheehan]]

The error text, for completeness:

Raw error output:
Aborting, could not apply patch buffer for 279261.
Error running git command; sanitised_command=['git', 'cherry-pick', '85726dd9ed6a1719d53017b270406e2e5c2c3d1f'], path='/files/repos/firefox-release', error: could not apply 85726dd9ed6a... Bug 2010551 - Re-enable custom review prompt r=android-reviewers,twhite
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

We need to consider error: could not apply in stderr as a condition where we should raise a PatchConflict. Currently we only check for error: patch.