Using merge --pull

[Juanma Barranquero]

On Sat, Jan 16, 2010 at 11:03, Eli Zaretskii <eliz at gnu.org> wrote:

> Is there a downside to using "bzr merge --pull" even if the branch is
> _known_ to diverge from the source?  From the docs, I understand that
> if the `pull' attempt succeeds, I don't need to commit after the
> merge.  This could be a win, because I need not remember to commit
> afterwards.  So this is a potential advantage; are there any
> disadvantages?

If you accidentally use "merge --pull" in the trunk, for example

  cd trunk
  bzr merge --pull ../my-development-branch

you will commit into trunk all changes in my-development-branch, as
separate commits (not as a single merge commit).

    Juanma