[17:33] <mbruzek> Hello #bzr, how does one merge diverged-branches?
[17:34] <mbruzek> bzr help diverged-branches has been run.
[17:34] <LeoNerd> bzr merge OTHER_URL   surely?
[17:34] <mbruzek> I ran "bzr merge", and it told me there was nothing to do.  How do I get the other URL?
[17:35] <LeoNerd> Mmm>
[17:35] <LeoNerd> It's.. the URL of the other side; wherever it has diverged from
[17:37] <mbruzek> OK thank you LeoNerd I was missing the OTHER_URL
[17:38] <mbruzek> I had to follow it with a bzr commit -m "Resolving divergent-branches"
[17:38] <mbruzek> And that seemed to have worked.
[17:46] <LeoNerd> :)