What I usually do is have multiple repos, one per machine I'm working on. This way they are write-once, read-many so you don't ever have dropbox merge conflicts

What I usually do is have multiple repos, one per machine I'm working on. This way they are write-once, read-many so you don't ever have dropbox merge conflicts. It's a bit more overhead, but safer. It's even "easier" to get the semantics right in bazaar due to the branch-as-a-folder paradigm rather than a repo-as-a-folder design of git, although I don't really want to devolve to a "my scm is better than your scm" debate.