Closed Bug 1805697 Opened 1 year ago Closed 1 year ago

Add git rebase conflict detection to fast-forward-libwebrtc.sh

Categories

(Core :: WebRTC, task, P2)

Product:
Core
Component:
WebRTC
Type:
task

Tracking

()

Status:
RESOLVED FIXED
Milestone:
110 Branch
Tracking Flags:
Tracking Status
firefox110 --- fixed

People

(Reporter: mjf, Assigned: mjf)

References

Details

Attachments

(1 file)

Bug 1805697 - add git rebase conflict detection to fast-forward-libwebrtc.sh r?dbaker!
48 bytes, text/x-phabricator-request
Details | Review

If the previous fast-foward operation resulted in a git rebase conflict, don't attempt the next fast-forward operation.

Assignee: nobody → mfroman
Severity: -- → S3
Depends on: libwebrtc-fast-forward
Priority: -- → P2
Pushed by mfroman@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/8291f3b30414
add git rebase conflict detection to fast-forward-libwebrtc.sh r=dbaker DONTBUILD

https://hg.mozilla.org/mozilla-central/rev/8291f3b30414

Status: NEW → RESOLVED
Closed: 1 year ago
status-firefox110: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 110 Branch
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: