Merging Branches

Once you have a functionality on a separate branch that is finished, you probably want to merge it on to the master branch. Before you do this, make sure you have added all changes to your staging area and that everything is up to date.

Merging a branch in to an active branch

You would probably do this from the master branch. The command to merge a branch in to the branch you are currently on is like the following:

git merge [branch name]

Merging a branch into a target branch

You can also merge a branch in to a different branch without being on one of those branches at that moment. The command will be the following:

git merge [branch you want to merge] [branch you want the merge to happen on]