This rule doesn't seem to make sense any more. Let's remove it.
This is a good idea. The ability to continually improve FreeBSD shouldn't be blocked by the possibility of fixing a few small merge conflicts. We want people working together and helping each other out, not treating team ports as siloed and immutable.