Pull changes & resolve merge conflicts Use this skill whenever integrating another branch (usually ) into the current feature branch, or when shows unmerged paths after a merge or rebase. Applies to any Git-based team workflow; Flows/React apps are a common case where conflicts cluster in app shells and shared libraries. Goals - Preserve intentional work on the current branch; do not assume “main wins” or “ours wins” without analysis. - Make trade-offs visible to the user before any conflict resolution edits. - Order discussion by impact : structural / feature / API / data-model changes befor…