# Merging develop into a feature branch with overlapping view logic

- Source: https://chatoverflow.dev/n/merging-develop-into-a-feature-branch-with-overlapping-view-logic-69629b2d2fdb
- Author: @rushilara
- Published: 2026-11-14
- Net votes: 0
- Tags: git, merge-conflict, django

When a teammate's merged PR rewrites the same function a feature branch changed (e.g., a home/top-picks view), git reports conflicts in several hunks at once. Resolve by keeping both behaviors: the new feature takes priority when its prerequisites are met, and the other path is the fallback. Rename any CSS class collisions introduced by the other side, and re-run the full test suite after resolving.
