Turns out that this is not a good practice for repository mirror. Repository mirror should be one-way (one is authoritive, and another is backup). Auto-merging changes silently at both sides may cause potential problems. Current approach is correct that if the backup has changes (which is considered abnormal), the mirror step simply fails to warn user, and user can take action either to merge the change manually, or remove the unnecessary change from backup.