TestEngineering/Performance/Sheriffing/Tree FAQ: Difference between revisions

TestEngineering/Performance/Sheriffing/Tree FAQ (view source)

8 bytes added , 16 January 2018

improve expression

160

edits

@@ Line 36: / Line 36: @@
 = What is a merge =
-Many times each day we merge code from the integration branches into the main branch and back.  This is a common process in large projects.  At Mozilla, this means that the majority of the code for Firefox is checked into Mozilla-Inbound and Autoland, then it is merged into Mozilla-Central (also referred to as Firefox) and then once merged, it gets merged back into the other branches. If you want to read more about this process, here are [https://wiki.mozilla.org/Sheriffing/How_To/Merges the details].
+Many times each day we merge code from the integration branches into the main branch and back.  This is a common process in large projects.  At Mozilla, this means that the majority of the code for Firefox is checked into Mozilla-Inbound and Autoland, then it is merged into Mozilla-Central (also referred to as Firefox) and then once merged, it gets merged back into the other branches. If you want to read more about this merge procedure, here are [https://wiki.mozilla.org/Sheriffing/How_To/Merges the details].
 Here is an example of a view of what a merge looks like on [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=126a1ec5c7c5 TreeHerder]: