Combining your feature with the “live” version of the system

When you start coding, your peers can work on other features in the meantime. To see if the features work together, you can combine the features by merging their branches. To merge their changes into your branch, you need to do the following;

Make sure that the to be merged branch is up to date (by using fetch and pull) then execute the following commands:

git checkout <base_branch_name>
git merge <branch_name_to_be_merged_into_base>