Resolve Git Conflict

Interview question

Using Git, you encounter a confusing merge conflict between two active feature branches with overlapping refactors; describe the exact Git commands and decision process you would use to resolve it while preserving both teams' work.