Git Pull request Kung Fu

TL;DR

Merging via command line

If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.

Step 1: From your project repository, bring in the changes and test.

git fetch origin
git checkout -b tscalf-unit_tests origin/tscalf-unit_tests
git merge master

Step 2: Merge the changes and update.

git checkout master
git merge --no-ff tscalf-unit_tests
git push origin master