Ok I've merged your branch, but a stupid question remain... I need then to commit. But will fernando manage easily the fact that my branch is a merge of my work and your work? Does bzr handle that for us? Sorry bzr newbie :) ...