Closed Bug 2004186 Opened 9 months ago Closed 9 months ago

display merge conflict resolution steps for failed uplift jobs

Categories

(Conduit :: Lando, enhancement, P3)

enhancement

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: sheehan, Assigned: sheehan)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

When an uplift request fails due to merge conflicts, users currently see a generic "Failed" status with raw error output. Instead, we should provide commands the user can run to resolve the conflicts locally and submit their stack for uplift approval.

Authored by https://github.com/cgsheeh
https://github.com/mozilla-conduit/lando/commit/b6d73cbc893dce6f17dd971fb7f233f361cbee75
[main] uplift: display commands required to resolve merge conflicts (Bug 2004186)

Status: NEW → RESOLVED
Closed: 9 months ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: