ubuntu-manual team mailing list archive

[Kevin Godby <godbyk@xxxxxxxxx>]

Hello, Bryan.

On Sun, Mar 7, 2010 at 7:29 PM, Bryan Behrenshausen
<bryan@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> I'm trying to push my recent commits to Launchpad and am receiving this error:
>
> bryan@bryan-aspire:~/Projects/ubuntu-manual$ bzr push lp:ubuntu-manual
> bzr: ERROR: These branches have diverged.  See "bzr help
> diverged-branches" for more information.
>
>
> What should I do?

That means that someone (in this case me) has uploaded stuff to bzr
between the time you committed your code and when you tried to push
your code.

If you run 'bzr merge', it will merge your code and my code.  If there
are no warnings about conflicts, you can run 'bzr commit' (to commit
the merged code -- for the message, just note that you're merging with
main branch), and then 'bzr push' should work.

Let me know if you continue to have problems with it.

--Kevin