[IPython-dev] [Branch ~ipython/ipython/trunk] Main line of IPython development (stable)
Ville M. Vainio
Wed Jun 4 06:39:34 CDT 2008
On Wed, Jun 4, 2008 at 11:22 AM, Fernando Perez <email@example.com> wrote:
> This is what lp thinks: that we've 'removed' revisions, simply because
> they were merged in my local copy. But I *have* to merge them,
> because I need to pull in the remote changes made from other
Actually, you don't need to merge changes from other developers in
your fix branch. "merge" is not "svn up". You should *pull* changes
from other developers (in your local trunk), *then* merge your changes
from your personal branch to the trunk.
Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'
More information about the IPython-dev