Bazaar

  1. Bug #175589
  2. Comment #4

Comment 4 for bug 175589

Revision history for this message
Stavros Korokithakis (stavrosk) wrote :

Try this:

commit to a bound branch
do some work
commit --local
do some work
update
your work has produced conflicts, even though the master branch is a strict subset of your local branch. Conflicts should not have been produced, and, ideally, bzr should have pushed your changes upstream without requiring you to commit again...