[ditz-talk] [Gitorious] ertai has requested a merge in ditz

William Morgan wmorgan-ditz at masanjin.net
Mon Apr 28 21:46:23 EDT 2008


Nicolas,

The two merge requests you've made have history in them from the edge
branch or from merges you've made against master. This means I can't
merge these into master without bringing in all that unrelated stuff.

Can you rebase these onto a commit from the mainline master branch? The
easiest way is something like:

For factorize-html:
  git checkout factorize-html
  git rebase --onto remotes/mainline/master HEAD^

for remove-ucfirst:
  git checkout remove-ucfirst
  git rebase --onto remotes/mainline/master HEAD^^^

or whatever you're calling "mainline/master". Note that when you push,
you'll have to use -f because this will be a non-fast-forward update.

Thanks,

-- 
William <wmorgan-ditz at masanjin.net>


More information about the ditz-talk mailing list