When a feature branch and main both gain commits, history diverges. A merge creates a new commit whose two parents point to both branch tips.
The demo reveals the shared base, branch commits, and reunion step by step. If changes conflict, a person must resolve them before the merge commit can be created.
When to use
Use it to integrate a feature while preserving branch history. Teams requiring linear history may choose another integration method.