Óscar Fuentes <ofv at wanadoo.es> writes: [snip] > if conflicts are found. But an implicit merge goes against bzr's policy. s/merge/commit.