Changes

Jump to: navigation, search

Sheriffing/How To/Merges

1,062 bytes removed, 21:38, 30 August 2018
Goal
{{Sheriffing How To|Merges}}
= Goal =
'''Autoland''' and '''Inbound''' repositories are opened for developers who work on bug fixes, improvements and other. Usually, '''twice a day''', Merging means that clean code is transferred form Autoland and Inbound to Central, and back. <br /><span style="color:#14866d">'''''No sync is performed, only differences are transferred (merge).'''''</span> Merges are done between <span style="color:#FF0000">'''8:00 PM – 10 PM''' UTC</span> and <span style="color:#FF0000">'''8 AM – 10 AM'''</span>. At <span style="color:#FF0000">'''11AM'''</span> and <span style="color:#FF0000">'''11PM'''</span> UTC time, <span style="color:#FF0000">'''Nightly builds start'''</span> (they take between 2 to 4 hours to build) and it’s desired to transfer as much clean code as possible. Ideally, merges should be done before 10 AM/PM UTC time to be able to fix bad code before Nightly builds start. Each sheriff should perform a merge at the beginning of their work day. Effectively, this results in two sets of merges every day to/from autoland and mozilla-inbound to mozilla-central. <span style="color:#FF0000">'''Note'''</span>: in winter Nightlies, always start at <span style="color:#FF0000">12PM/AM Romanian time</span> (+1 or 2 minutes after that), so having merges done before that helps with getting the changes into these builds. How long it takes to merge depends, mostly on merge conflicts. 
= Choosing a changeset to merge =
Confirm
79
edits

Navigation menu