merge

basicwidespread

Merge is the operation where two separately created versions of a program are combined into a single common version so that modifications from both are preserved.

In plain terms

Imagine you are both working on the same thesis: you rewrite the introduction, and your partner works on the third chapter. In the end, someone must combine the two copies into a single text so that both of your work is included. In software development, this combination is called a merge.

Developers rarely work directly on the "official" code. Everyone opens a separate branch, creates the new feature or bug fix there, and once finished, merges their work back into the shared version. This allows many people, and increasingly many coding agents, to work in parallel without stepping on each other's toes.

Merge is not simple copying or overwriting. The version control program checks line by line who changed what, and in most cases automatically assembles the result. It only asks for help if two people edited the same part in two different ways.

How it works

The version control system (most often Git) finds the common ancestor: the last state when the two versions were still identical.
It compares what has changed on one branch versus the other, relative to this common starting point.
If modifications affect different files or distant parts of the same file, the program automatically merges them.
If both branches modify the same line or directly adjacent lines differently, a merge conflict arises: the program marks the disputed part, and a human or an agent must decide what to keep.
The result is usually recorded in the history as a new save point (merge commit), so it can later be traced what was merged and when. If nothing has changed on the target branch in the meantime, Git simply moves the branch forward without creating a new save point (fast-forward).

An everyday example

You ask a coding agent to add dark mode to your website. The agent prepares it in a separate branch, then signals that the change is ready and "mergeable." When you click the Merge button on GitHub, its work enters the project's main branch. In many teams, it automatically goes live from there.

Who is affected

developerDaily, this operation integrates their work into the shared codebase, and they must resolve the conflicts. → Code

entrepreneur, executiveThe merge is the point where it is decided what goes into the product, so human approval and review should be required here.

employeeIf you have an AI agent produce code or automation, then by approving the merge you are in practice responsible for what goes in. You cannot blame the agent, so review and test the change before approving it. → Work & HR

A common misconception

MythIf the merge runs without error messages or conflicts, the program is certainly working correctly.

In realityA version control system only merges the text; it does not understand what the code does. Two individually good modifications can cause errors when combined, so testing is still required after a merge.

Limits and risks

Automatic merging works only at the line level and does not check the code's meaning, so it easily passes logical errors.
The longer a branch lives separately, the more and the harder-to-resolve conflicts you can expect.
Code produced in parallel by many agents is generated faster than a human can review, so pre-merge checks can easily become a bottleneck or a formality.
A hasty merge can introduce the error into the live system; it is reversible, but this requires extra work, and the damage is done in the meantime.

Similar, but not the same

rebase – Rebase moves the modifications of one branch to the top of another, rewriting history as if the work was done sequentially. Merge, by contrast, preserves the trace of parallel branches.
pull request – A pull request is the request and discussion about whether a change can be included, while the merge is the integration itself, which occurs after approval.
commit – A commit records a save point on a single branch, while a merge links the histories of two branches.

Related concepts

Broader

version control, Git, software development

Narrower

merge conflict, squash merge, fast-forward merge

On the edge

branch, commit, pull request, rebase, code verification

A brief history

Merging evolved over decades along with version control systems. It truly became a common operation thanks to Git, released in 2005, which Linus Torvalds created for Linux development and which made branching and merging cheap and fast.

Where things stand

Merge is a fundamental operation in software development, used by practically every team daily. In late 2026, coding agents prepare a growing number of changes for merging and also help resolve conflicts, but final approval stays with a human on most teams.

Status: 2026 November

In the news

Appears in 18 Agent Age stories; the curve shows weekly occurrence in the news magazine.

OpenAI builds new Git backend Pando after Codex agents drive commit surgeNov 4, 2026 · Code
Google to merge AI Mode, AI Overviews and classic results into one Search productNov 3, 2026 · Marketing
AI ad-placement companies Rembrand and Whisper World merge, eye IPONov 2, 2026 · Marketing
OpenAI to pool ChatGPT and Codex usage allowance from DecemberNov 2, 2026 · Code
Cyberattacks on the legal sector double as attackers deploy autonomous AI agents, CrowdStrike saysOct 29, 2026 · Jog
Flagship merges three biotech platforms into AI drug discovery company EtceleraOct 29, 2026 · Health
Copilot gains Agent Merge, Automations and agents in Dev Containers with VS Code 1.137Oct 26, 2026 · Code
A third of GitHub pull requests now involve an AI agent, reports sayOct 12, 2026 · Code

Also known as

merge · merging · merging · merge · merging · merging · git merge · merging

Sources

This entry was machine-edited and has undergone machine expert review; the “In the news” section updates automatically from Agent Age stories.