Confirmed users
2,317
edits
Sheriffing/How To/Merges: Difference between revisions
→Step 2
No edit summary |
(→Step 2) |
||
| Line 27: | Line 27: | ||
-> hg commit -m "merge bla to bla" | -> hg commit -m "merge bla to bla" | ||
-> hg push | -> hg push | ||
since this above might result in race conditions on the tree (when its busy there) this works better -> hg pull && hg update && hg merge && hg commit -m "Merge m-c to [TREENAME]" && hg push | since this above might result in race conditions on the tree | ||
(when its busy there) this works better -> | |||
hg pull && hg update && 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! | ||