---
title: Merging
tags: git,notes
---


Merging is a Git's way of putting separate branch back together again.
1. Git merge combines sequences of commits into 1 unified history of commits
2. There are two main ways Git will merge: **Fast forward** and **Three way**
3. Git can automatically merge commits unless there are changes that conflicts in both commit sequences