>Fast-forward merge
No merge commits are created
Fast-forward merges only
When conflicts arise the user is given the option to rebase