Em Ter, 2014-03-11 às 01:21 +0100, Krzysztof Kosiński escreveu:
However if you set this, you won't be able to merge other users'
changes and then push. Use this instead:

bzr checkout lp:path/to/branch working_dir    <-- only the first time
cd working_dir
bzr update   <-- after the first time
bzr merge <path to your working tree>
bzr commit

Actually, this text-driven tutorial is confusing. An ascii cast is way more user friendly.

I created a playground repo to expose your idea, but end up not working: https://asciinema.org/a/8096

Some missing bazaar feature. Anyway, ascii cast is an interesting way to explain these workflows.


--
Vinícius dos Santos Oliveira
https://about.me/vinipsmaker