2014-03-11 18:16 GMT+01:00 LucaDC <dicappello@...2144...>:
- bzr update -r xxx, where xxx is the revision where your changes
applied cleanly 2. bzr unbind - this will convert from a checkout to a regular branch 3. bzr commit
Unfortunately this does not work if the update has been issued on changes that were not yet committed and this happens because the commit of a checkout is impossible until the update is done.
One of us must be missing something. The commands I wrote would have the following effect: 1. Return to the state in which you were before the "bzr update" that introduced conflicts. 2. Convert from a checkout to a normal branch. The association with the remote branch is broken. 3. Commit to the normal branch locally.
After that, you can do a merge or continue working on your code locally.
Regards, Krzysztof