Confirmed users
2,317
edits
Sheriffing/How To/Merges: Difference between revisions
no edit summary
(→Step 2) |
No edit summary |
||
| Line 29: | Line 29: | ||
since this above might result in race conditions on the tree | since this above might result in race conditions on the tree | ||
(when its busy there) this works better -> | (when its busy there) this works better -> | ||
hg pull && hg update | go to your m-i tree | ||
hg pull && hg update && hg pull ssh://hg.mozilla.org/mozilla-central/ && hg merge && hg commit -m "Merge m-c to [TREENAME]" && hg push | |||
Aliases for the various repositories make the above easier to type! | Aliases for the various repositories make the above easier to type! | ||