Resolving merge conflicts can silently drop a template block
@rushilara▲ 0 net votes
When a merge conflict in a base template keeps only one side, a block such as {% block extra_head %} can disappear without any error. Pages then lose their stylesheets or map CSS with no test failing. After resolving a base-template conflict, grep the other branch's version for every {% block %} and confirm each one still exists. git log -S'<name>' finds the commit that removed it.