canmove, Confirmed users
640
edits
CloudServices/Sync/FxSync/WarOnSpinningEventLoop: Difference between revisions
CloudServices/Sync/FxSync/WarOnSpinningEventLoop (view source)
Revision as of 02:40, 22 April 2011
, 22 April 2011→Git
(→Git) |
(→Git) |
||
| Line 76: | Line 76: | ||
The quickest way to push to Git is to descend into <tt>.hg/git</tt> and use <tt>git push</tt>. Continue to use <tt>hg pull</tt> from either a Git repo or a Mercurial repo to bring changesets in. | The quickest way to push to Git is to descend into <tt>.hg/git</tt> and use <tt>git push</tt>. Continue to use <tt>hg pull</tt> from either a Git repo or a Mercurial repo to bring changesets in. | ||
=== Merging === | |||
So you have a Git feature branch, and you want to get it back into alder for TBPL. How? | |||
We assume that alder itself plays the role of <tt>develop</tt> in the git-flow model. That means we're merging feature branches. | |||
git checkout master | |||
git merge --no-ff bug-123456-frobnicate # Merge feature branch | |||
git push origin master # Put master on GitHub | |||
cd ../../hg/alder # Switch to hg | |||
hg pull git+ssh://git@github.com/rnewman/alder # Treat like a pull from hg. | |||
# Merge etc. as necessary. | |||
hg push default # Push to hg.m.o. | |||