Re: identical changes conflict

So far, I've found a simple way to prevent the conflict: since my
original repo has a checkout:edit mode, I have to say, after
anexternal identical change on a file, but before bk pull: bk unedit
file, and then bk pull from the repo with the same identical update. 
So, if the identical change is done by an external SCM, I can have a
list of files that were identically modified, i.e. not in fact
modified but just touched, and run xargs bk unedit on them prior to bk
pull.  I wonder whether this is the only/simplest way to prevent the
identical changes conflict?

Cheers,
Alexy