03-Git-Merging-Branches.md

Git Merging Branches

• Take me to Video Tutorial

In this section, we will take a look at git merging braches

We can merge a branch with 'git merge' command

$ git checkout master
$ git merge feature/signup

Two types of merge that git can perform

1. Fast forward merge

   

2. No-Fast Forward merge