> > I tried bzr ci --local, which cleared up the pending merge. > > The log says no files were modified, so everything seems to be OK. > > You can clear pending merges by command: > > bzr revert --forget-merges > > In this case yiou don't need to ci --local Thanks for the tip! /Daniel