Resolve Merge Conflicts Overview Resolve conflicts without opening full files unless the compact view is insufficient. Start with a summary, then inspect one conflicted file at a time. Workflow 1. Start with a summary. Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains. 2. Drill into one file. Prefer this over reading the whole file. The script prints only nearby context, the / / sections for each hunk, and a compact unified diff between and . 3. Resolve the file. - Take one side wholesale with or when appropriate. - Ot…