| === jelmer_ is now known as jelmer | |
| [03:00] <kbulgrien> so here's the thing, about the checkout into an existing workspace. | |
| [03:00] <kbulgrien> Now it is telling me all the stuff is removed. | |
| [03:00] <kbulgrien> all I did, to my knowledge is bzr resolve conflict. | |
| [03:01] <kbulgrien> what am I supposed to do to clear a conflict without it assuming it should now remove the stuff? | |
| [03:09] <kbulgrien> If I re-add the removed stuff, it is both removed and added. | |
| [03:09] <kbulgrien> It should be just modified | |
| [11:09] <LarstiQ> kbulgrien: --take-other/--take-this? | |
| === yofel_ is now known as yofel | |
| === hughrawlinson is now known as codeoclock | |
| === wallyworld is now known as Guest31247 | |
| === mars is now known as Guest83177 | |
| [18:51] <kbulgrien> Problematic not being able to status without recurse. | |
| [19:04] <jelmer> kbulgrien: isn't there --no-recurse? | |