| === seelaman` is now known as seelaman | ||
| === thumper is now known as thumper-afk | ||
| === fullermd_ is now known as fullermd | ||
| === zyga_ is now known as zyga | ||
| === mthaddon` is now known as mthaddon | ||
| === deej` is now known as deej | ||
| === zyga is now known as zyga-afk | ||
| === yofel_ is now known as yofel | ||
| === elmo_ is now known as elmo | ||
| === zyga-afk is now known as zyga | ||
| === WebbyIT is now known as rpadovani | ||
| === seelaman` is now known as seelaman | ||
| mbruzek | Hello #bzr, how does one merge diverged-branches? | 17:33 |
|---|---|---|
| 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:34 |
| LeoNerd | Mmm> | 17:35 |
| LeoNerd | It's.. the URL of the other side; wherever it has diverged from | 17:35 |
| mbruzek | OK thank you LeoNerd I was missing the OTHER_URL | 17:37 |
| mbruzek | I had to follow it with a bzr commit -m "Resolving divergent-branches" | 17:38 |
| mbruzek | And that seemed to have worked. | 17:38 |
| LeoNerd | :) | 17:46 |
| === Kraln- is now known as Kraln | ||
| === gthorslund is now known as Guest39938 | ||
| === Guest39938 is now known as gthorslund_ | ||
| === Guest70848 is now known as wallyworld | ||
| === hloeung is now known as Guest14965 | ||
| === Guest14965 is now known as hloeung | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!