D279261- Lando - Mozilla

firefox-beta

Requested revisions apply cleanly to uplift branch; uplift revisions created

D279826

View job

firefox-release

Failed

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"

To manually resolve conflicts and submit your uplift:

git fetch origin
git switch -c uplift-firefox-release-D279261 origin/release
git cherry-pick 85726dd9ed6a1719d53017b270406e2e5c2c3d1f
moz-phab uplift --train firefox-release --assessment-id 912

Run these commands from your Firefox checkout. Resolve any merge conflicts during the patch application process, then submit with moz-phab uplift.

Note: These commands assume your official Firefox remote is named origin. If you use a different remote name, adjust the commands accordingly.

View job

Landings for Stack Containing D279261

Uplifts

Stack containing revision D279261