Code review comment for lp://staging/~rom1-chal/bzr-builder/reporting_conflict_from_merge

Voting Needs Fixing, as I think this is something that is more appropriate for the regular bzr merge code in one form or another - it's not really bzr-builder specific.