Software Engineering · Version Control
Combining the changes from one branch into another, producing a unified history that includes both lines of work.
In practice: Merge commits preserve branch history; squash merges flatten it into one commit for a cleaner log — both are legitimate, and teams usually pick one and stay consistent.