Overview Merge into the branch that should receive changes. When Git cannot combine overlapping edits safely, resolve the file manually, stage the chosen result, and commit the resolution as part of project history.