Software delivery

Merge

Also called: Git Merge · Merge Branch · Merge Changes · Merging Code

The short version

A merge combines changes from one branch into another, often after the team reviews them.

Bring the work together

Developers can work on separate branches. When a change passes review and checks, its branch can be merged into another branch, often main.

Git combines most changes automatically. If edits overlap and Git cannot choose a result, someone must resolve a merge conflict.

Merged is not live

A merge updates a repository, not the running app. Customers can use the change only after it is deployed and released. Teams can merge locally or through a hosting service.