level 3Git & Version Control
Merge
also: merged, merging, merges
Combining the changes from one branch into another, usually bringing finished work back into the main version.
a bit more technical
A Git operation that brings the history of one branch into another. If the target branch hasn't moved, Git can simply fast-forward it. Otherwise it creates a merge commit joining both lines of work, and stops for a person if the same lines conflict.
picture it
Two people edited separate chapters of a shared book. Merging puts both sets of edits into the final manuscript.
why it matters
Merging is the moment an agent's work joins your real app. Once it's merged into main, it may deploy automatically, so this is the point to review carefully.
what your agent might say
The feature branch is up to date with main and tests pass. Ready to merge? This will trigger a production deploy.
how you might use it
Don't merge anything into main yet. Tell me what the merge would change and whether there are any conflicts.
common mistake
Thinking merge means replace. Merging combines: changes from both branches end up together.
builds on