Types of Merge

• Fast forward merge

• 3-way merge

Example

git checkout master

git merge somefeature

Fastforward

This puts the feature ontop of the HEAD of master

3-way branch

git checkout master

git merge --no-ff somefeaturemerge

a feature back into master

Note: A new merge commit is generated (a new node)

Work Flow: merge conflict resolution

git checkout master

merge mynewfeaturebranch

# a conflict arrises

# fix the problems

git add .

git commit

Work Flow: Fetch / Merge

git checkout some-feature

git fetch origin

git merge origin/master

Work Flow: Rebase a feature onto the HEAD of master

git checkout some-feature

git fetch origin

git rebase origin/master