[IPython-dev] Hum... tried to merge gael branch...

[Gael Varoquaux]

On Wed, Feb 11, 2009 at 11:19:35PM +0100, Laurent Dufréchou wrote:
> Yeah! This is what I've just seen :)
> In fact i think only the chmod +x has changed I think...

> If I merge with trunk, then I need to commit back to my branch. Does
> it will have some side effect when merging back my branch????

> For example can I safely do:
> bzr merge ipython main branch +
> bzr merge gael branch

> and than later merge my code into main one?

> If that works, wow bzr is good :)!

As long as there are no conflicts between my branch and trunk, this will
work. Avoiding conflicts with a branch and trunk is a good policy,
because it renders this kind of development pattern possible. If you have
to create conflicts, then you are on your own...

Gaël