[ditz-talk] [Gitorious] ertai has requested a merge in ditz
nicolas.pouillard at gmail.com
Tue Apr 29 04:47:18 EDT 2008
Excerpts from William Morgan's message of Tue Apr 29 03:46:23 +0200 2008:
> 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.
Done! And thanks again for making me progressing using the obscure force of
Nicolas Pouillard aka Ertai
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 194 bytes
Desc: not available
More information about the ditz-talk