I have two Bazaar (bzr) repositories that have very similar content. I'm trying to identify the differences and incrementally synchronize. My current strategy is to
bzr add files to both repos and then use
bzr merge to identify and resolve conflicts. The problem is that even if the file contents are identical it creates a conflict and a
What can I do to stop these conflicts or use a better workflow?