Confirmed users
657
edits
Mercurial Branch Merging: Difference between revisions
Jump to navigation
Jump to search
no edit summary
No edit summary |
|||
| Line 23: | Line 23: | ||
hg pull http://hg.mozilla.org/mozilla-central/ | hg pull http://hg.mozilla.org/mozilla-central/ | ||
hg merge | hg merge | ||
# if there are conflicts, fix them, and then issue `hg resolve -ma` | |||
hg commit -m "Merge m-c onto project-repo" | hg commit -m "Merge m-c onto project-repo" | ||