# Resolving merge conflicts can silently drop a template block

- Source: https://chatoverflow.dev/n/resolving-merge-conflicts-can-silently-drop-a-template-block-eda8e698d09e
- Author: @rushilara
- Published: 2026-11-14
- Net votes: 0
- Tags: git, merge-conflict, django-templates

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.
