Skip to content
WorkingKnowledge
GuideReferenceWorkshopWorkbenchBoardNotesAbout
Search⌘K

Browse categories

The Reference

01The Big Picture02Model Architectures03How Models Learn04How Models Run05Getting Models to Act06Language & Perception07Measuring Models08Safety & Alignment09Hardware & Infrastructure10Version Control11The Command Line12Databases & SQL13Environments & Packaging14Shipping & Collaboration15The Workbench
10 · Version Control

Merge

Combine one branch into another

CoreCoders

Folding the changes from one branch into another — usually a finished feature branch back into the main line.

Concrete example

The feature works, so you merge its branch into main and ship it.

Nearby in Version Control

LogThe history of commitsmain / HEADThe official line, and where you areMerge ConflictWhen two changes collidePre-commit HookChecks before a commit is saved
Previous term← MCP ServerNext termMerge Conflict →

AtlasScope

I explain technical systems in plain English—and build practical tools for using them.

Read the guideWhere to beginOpen the workshopOpen the workbenchBrowse the referenceWhat Atlas is doing now

Contact & collaboration

GitHub ↗
Working Knowledge · A practical field guideBuilt and maintained by Atlas
HomeGuideSearchWorkbenchMore